Merge pull request #110 from oracle-devrel/develop-temp

Automation Toolkit Release v2024.3.0

Author: xs2suruchi

OCIWorkVMStack/data_sources.tf

@@ -1,40 +1,40 @@
-/*
-data "oci_identity_availability_domain" "ad" {
-  compartment_id = var.tenancy_ocid
-  ad_number      = var.availability_domain_number
-}
-*/
-
-data "oci_identity_tenancy" "tenancy" {
-    #Required
-    tenancy_id = var.tenancy_ocid
-}
-
-data "oci_core_subnet" "subnet" {
-  #Required
-  count     = var.vcn_strategy == "Use Existing VCN" ? 1 : 0
-  subnet_id = var.existing_subnet_id
-}
-
-data "oci_identity_compartment" "compartment" {
-    #Required
-    id = local.instance_compartment_ocid
-    depends_on = [module.instance]
-}
-
-data "oci_core_images" "oracle_linux" {
-  compartment_id   = var.tenancy_ocid
-  operating_system = "Oracle Linux"
-  shape            = var.instance_shape
-  #display_name     = var.instance_os_version
-  sort_by          = "TIMECREATED"
-  sort_order       = "DESC"
-  state            = "AVAILABLE"
-
-   #filter restricts to OL
-  filter {
-    name   = "operating_system_version"
-    values = ["${local.os_version}"]
-    regex  = false
-  }
-}
+/*
+data "oci_identity_availability_domain" "ad" {
+  compartment_id = var.tenancy_ocid
+  ad_number      = var.availability_domain_number
+}
+*/
+
+data "oci_identity_tenancy" "tenancy" {
+    #Required
+    tenancy_id = var.tenancy_ocid
+}
+
+data "oci_core_subnet" "subnet" {
+  #Required
+  count     = var.vcn_strategy == "Use Existing VCN" ? 1 : 0
+  subnet_id = var.existing_subnet_id
+}
+
+data "oci_identity_compartment" "compartment" {
+    #Required
+    id = local.instance_compartment_ocid
+    depends_on = [module.instance]
+}
+
+data "oci_core_images" "oracle_linux" {
+  compartment_id   = var.tenancy_ocid
+  operating_system = "Oracle Linux"
+  shape            = var.instance_shape
+  #display_name     = var.instance_os_version
+  sort_by          = "TIMECREATED"
+  sort_order       = "DESC"
+  state            = "AVAILABLE"
+
+   #filter restricts to OL
+  filter {
+    name   = "operating_system_version"
+    values = ["${local.os_version}"]
+    regex  = false
+  }
+}

OCIWorkVMStack/installToolkit.sh

@@ -1,26 +1,26 @@
-locals {
-  instance_compartment_ocid = var.instance_compartment_strategy == "Create New Compartment - Stack must be provisioned in home region" ? module.compartment[0].compartment_tf_id : var.instance_compartment_ocid
-  #vcn_compartment_ocid = var.vcn_strategy == "Use Existing VCN" ? var.vcn_compartment_ocid : module.compartment[0].compartment_tf_id
-  vcn_compartment_ocid = var.vcn_strategy == "Use Existing VCN" ? var.vcn_compartment_ocid : local.instance_compartment_ocid
-  nsg_id         = var.assign_existing_nsg == true ? var.existing_nsg_id : null
-  is_public_sub  = var.vcn_strategy == "Use Existing VCN" ? !data.oci_core_subnet.subnet[0].prohibit_public_ip_on_vnic : false
-  assignPublicIP = var.vcn_strategy == "Create New VCN" ? var.assign_public_ip : ((local.is_public_sub && var.assign_publicip_existing_subnet) == true ? true : false)
-  tenancy_name   = data.oci_identity_tenancy.tenancy.name
-
-  # Logic to select Oracle Autonomous Linux 7 platform image (version pegged in data source filter)
-  #platform_image_id = data.oci_core_images.ol7.images[0].id
-  # Logic to choose a custom image or a marketplace image.
-  #compute_image_id = var.mp_subscription_enabled ? var.mp_listing_resource_id : var.instance_image_ocid
-  # Local to control subscription to Marketplace image.
-  mp_subscription_enabled = var.mp_subscription_enabled ? 1 : 0
-
-  # Marketplace Image listing variables - required for subscription only
-  listing_id               = var.mp_listing_id
-  listing_resource_id      = var.mp_listing_resource_id
-  listing_resource_version = var.mp_listing_resource_version
-
-  os_version = var.instance_os_version == "Oracle-Linux-9" ? 9 : (var.instance_os_version == "Oracle-Linux-8" ? 8 : 7.9)
-
-  instance_image_ocid = data.oci_core_images.oracle_linux.images[1].id
-
-}
+locals {
+  instance_compartment_ocid = var.instance_compartment_strategy == "Create New Compartment - Stack must be provisioned in home region" ? module.compartment[0].compartment_tf_id : var.instance_compartment_ocid
+  #vcn_compartment_ocid = var.vcn_strategy == "Use Existing VCN" ? var.vcn_compartment_ocid : module.compartment[0].compartment_tf_id
+  vcn_compartment_ocid = var.vcn_strategy == "Use Existing VCN" ? var.vcn_compartment_ocid : local.instance_compartment_ocid
+  nsg_id         = var.assign_existing_nsg == true ? var.existing_nsg_id : null
+  is_public_sub  = var.vcn_strategy == "Use Existing VCN" ? !data.oci_core_subnet.subnet[0].prohibit_public_ip_on_vnic : false
+  assignPublicIP = var.vcn_strategy == "Create New VCN" ? var.assign_public_ip : ((local.is_public_sub && var.assign_publicip_existing_subnet) == true ? true : false)
+  tenancy_name   = data.oci_identity_tenancy.tenancy.name
+
+  # Logic to select Oracle Autonomous Linux 7 platform image (version pegged in data source filter)
+  #platform_image_id = data.oci_core_images.ol7.images[0].id
+  # Logic to choose a custom image or a marketplace image.
+  #compute_image_id = var.mp_subscription_enabled ? var.mp_listing_resource_id : var.instance_image_ocid
+  # Local to control subscription to Marketplace image.
+  mp_subscription_enabled = var.mp_subscription_enabled ? 1 : 0
+
+  # Marketplace Image listing variables - required for subscription only
+  listing_id               = var.mp_listing_id
+  listing_resource_id      = var.mp_listing_resource_id
+  listing_resource_version = var.mp_listing_resource_version
+
+  os_version = var.instance_os_version == "Oracle-Linux-9" ? 9 : (var.instance_os_version == "Oracle-Linux-8" ? 8 : 7.9)
+
+  instance_image_ocid = data.oci_core_images.oracle_linux.images[1].id
+
+}

OCIWorkVMStack/locals.tf

@@ -43,6 +43,10 @@ module "instance" {
   ssh_public_key            = var.ssh_public_key
   assign_public_ip          = local.assignPublicIP
   cloud_init_script         = var.cloud_init_script
+  tenancy_ocid              = var.tenancy_ocid
+  current_user_ocid         = var.current_user_ocid
+  config_region             = var.region 
+  tenancy_name              = local.tenancy_name
 }
 
 # This resource will wait for ~ 15 min to cloud init script to completed cd3 related steps

OCIWorkVMStack/main.tf

@@ -24,6 +24,10 @@ resource "oci_core_instance" "instances" {
   }
   metadata = {
     ssh_authorized_keys = var.ssh_public_key
+    tenancy_ocid        = var.tenancy_ocid
+    tenancy_name        = var.tenancy_name
+    current_user_ocid   = var.current_user_ocid
+    config_region       = var.config_region
     user_data           = fileexists("${path.root}/scripts/${var.cloud_init_script}") ? "${base64encode(file("${path.root}/scripts/${var.cloud_init_script}"))}" : null
   }
 

OCIWorkVMStack/modules/compute/instance.tf

@@ -78,3 +78,19 @@ variable "cloud_init_script" {
   type        = string
   default     = "installToolkit.sh"
 }
+
+variable "tenancy_ocid" {
+  type = string
+}
+
+variable "current_user_ocid" {
+  type = string
+}
+
+variable "tenancy_name" {
+  type = string
+}
+
+variable "config_region" {
+  type = string
+}