Moved Image OCID to top level.

Author: smithzc

terraform/compute.tf

@@ -5,6 +5,7 @@ module "bastion" {
 	compartment_ocid = "${var.compartment_ocid}"
 	subnet_id = "${module.network.bastion-id}" 
 	availability_domain = "${lookup(data.oci_identity_availability_domains.ADs.availability_domains[var.availability_domain - 1],"name")}"
+	image_ocid = "${var.ImageInstanceOCID[var.region]}"
 	ssh_keypath = "${var.ssh_keypath}" 
         ssh_private_key = "${var.ssh_private_key}"
 	ssh_public_key = "${var.ssh_public_key}"
@@ -22,6 +23,7 @@ module "utility" {
 	compartment_ocid = "${var.compartment_ocid}"
         subnet_id = "${module.network.public-id}"
 	availability_domain = "${lookup(data.oci_identity_availability_domains.ADs.availability_domains[var.availability_domain - 1],"name")}"
+	image_ocid = "${var.ImageInstanceOCID[var.region]}"
 	ssh_keypath = "${var.ssh_keypath}"
 	ssh_private_key = "${var.ssh_private_key}"
         ssh_public_key = "${var.ssh_public_key}"
@@ -39,6 +41,7 @@ module "master" {
 	compartment_ocid = "${var.compartment_ocid}"
         subnet_id = "${module.network.private-id}"
         availability_domain = "${lookup(data.oci_identity_availability_domains.ADs.availability_domains[var.availability_domain - 1],"name")}"
+	image_ocid = "${var.ImageInstanceOCID[var.region]}"
 	ssh_keypath = "${var.ssh_keypath}"
         ssh_private_key = "${var.ssh_private_key}"
         ssh_public_key = "${var.ssh_public_key}"
@@ -56,6 +59,7 @@ module "worker" {
 	compartment_ocid = "${var.compartment_ocid}"
         subnet_id = "${module.network.private-id}"
         availability_domain = "${lookup(data.oci_identity_availability_domains.ADs.availability_domains[var.availability_domain - 1],"name")}"
+	image_ocid = "${var.ImageInstanceOCID[var.region]}"
         ssh_keypath = "${var.ssh_keypath}"
         ssh_private_key = "${var.ssh_private_key}"
         ssh_public_key = "${var.ssh_public_key}"

terraform/modules/bastion/main.tf

@@ -8,7 +8,7 @@ resource "oci_core_instance" "Bastion" {
 
   source_details {
     source_type             = "image"
-    source_id               = "${var.InstanceImageOCID[var.region]}"
+    source_id               = "${var.image_ocid}"
   }
 
   metadata {

terraform/modules/bastion/variables.tf

@@ -12,6 +12,7 @@ variable "ssh_private_key" {}
 variable "instances" {}
 variable "subnet_id" {}
 variable "user_data" {}
+variable "image_ocid" {}
 
 # ---------------------------------------------------------------------------------------------------------------------
 # Optional variables
@@ -53,17 +54,3 @@ variable "ssh_keypath" {
 # You probably don't need to change these.
 # ---------------------------------------------------------------------------------------------------------------------
 
-// See https://docs.us-phoenix-1.oraclecloud.com/images/
-// Oracle-provided image "Oracle-Linux-7.6-2019.03.22-1"
-// Kernel Version: 4.14.35-1844.3.2.el7uek.x86_64
-variable "InstanceImageOCID" {
-  type = "map"
-  default = {
-    ca-toronto-1 = "ocid1.image.oc1.ca-toronto-1.aaaaaaaaqopv4wgbh54jrqoa4bjpkng2y2npzoe2jaj5pdne37ljdxbbbdka"
-    eu-frankfurt-1 = "ocid1.image.oc1.eu-frankfurt-1.aaaaaaaa2n5z4nmkqjf27btkbdibflwvximz5i3rsz57c3gowckozrdshnua"
-    uk-london-1 = "ocid1.image.oc1.uk-london-1.aaaaaaaaaxnnrqke453ur5katouvfn2i6oweuwpixx6mm5e4nqtci7oztx5a"
-    us-ashburn-1 = "ocid1.image.oc1.iad.aaaaaaaavxqdkuyamlnrdo3q7qa7q3tsd6vnyrxjy3nmdbpv7fs7um53zh5q"
-    us-phoenix-1 = "ocid1.image.oc1.phx.aaaaaaaapxvrtwbpgy3lchk2usn462ekarljwg4zou2acmundxlkzdty4bjq"
-  }
-}
-

terraform/modules/master/main.tf

@@ -10,7 +10,7 @@ resource "oci_core_instance" "Master" {
 
   source_details {
     source_type             = "image"
-    source_id               = "${var.InstanceImageOCID[var.region]}"
+    source_id               = "${var.image_ocid"
   }
 
   metadata {

terraform/modules/master/variables.tf

@@ -12,6 +12,7 @@ variable "ssh_private_key" {}
 variable "instances" {}
 variable "subnet_id" {}
 variable "user_data" {}
+variable "image_ocid" {}
 
 # ---------------------------------------------------------------------------------------------------------------------
 # Optional variables
@@ -65,18 +66,3 @@ variable "ssh_keypath" {
 # Constants
 # You probably don't need to change these.
 # ---------------------------------------------------------------------------------------------------------------------
-
-// See https://docs.us-phoenix-1.oraclecloud.com/images/
-// Oracle-provided image "Oracle-Linux-7.6-2019.03.22-1"
-// Kernel Version: 4.14.35-1844.3.2.el7uek.x86_64
-variable "InstanceImageOCID" {
-  type = "map"
-  default = {
-    ca-toronto-1 = "ocid1.image.oc1.ca-toronto-1.aaaaaaaaqopv4wgbh54jrqoa4bjpkng2y2npzoe2jaj5pdne37ljdxbbbdka"
-    eu-frankfurt-1 = "ocid1.image.oc1.eu-frankfurt-1.aaaaaaaa2n5z4nmkqjf27btkbdibflwvximz5i3rsz57c3gowckozrdshnua"
-    uk-london-1 = "ocid1.image.oc1.uk-london-1.aaaaaaaaaxnnrqke453ur5katouvfn2i6oweuwpixx6mm5e4nqtci7oztx5a"
-    us-ashburn-1 = "ocid1.image.oc1.iad.aaaaaaaavxqdkuyamlnrdo3q7qa7q3tsd6vnyrxjy3nmdbpv7fs7um53zh5q"
-    us-phoenix-1 = "ocid1.image.oc1.phx.aaaaaaaapxvrtwbpgy3lchk2usn462ekarljwg4zou2acmundxlkzdty4bjq"
-  }
-}
-

terraform/modules/utility/main.tf

@@ -9,7 +9,7 @@ resource "oci_core_instance" "Utility" {
 
   source_details {
     source_type             = "image"
-    source_id               = "${var.InstanceImageOCID[var.region]}"
+    source_id               = "${var.image_ocid}"
   }
 
   metadata {

terraform/modules/utility/variables.tf

@@ -12,6 +12,7 @@ variable "ssh_private_key" {}
 variable "instances" {}
 variable "subnet_id" {}
 variable "user_data" {}
+variable "image_ocid" {}
 
 # ---------------------------------------------------------------------------------------------------------------------
 # Optional variables
@@ -56,18 +57,3 @@ variable "ssh_keypath" {
 # Constants
 # You probably don't need to change these.
 # ---------------------------------------------------------------------------------------------------------------------
-
-// See https://docs.us-phoenix-1.oraclecloud.com/images/
-// Oracle-provided image "Oracle-Linux-7.6-2019.03.22-1"
-// Kernel Version: 4.14.35-1844.3.2.el7uek.x86_64
-variable "InstanceImageOCID" {
-  type = "map"
-  default = {
-    ca-toronto-1 = "ocid1.image.oc1.ca-toronto-1.aaaaaaaaqopv4wgbh54jrqoa4bjpkng2y2npzoe2jaj5pdne37ljdxbbbdka"
-    eu-frankfurt-1 = "ocid1.image.oc1.eu-frankfurt-1.aaaaaaaa2n5z4nmkqjf27btkbdibflwvximz5i3rsz57c3gowckozrdshnua"
-    uk-london-1 = "ocid1.image.oc1.uk-london-1.aaaaaaaaaxnnrqke453ur5katouvfn2i6oweuwpixx6mm5e4nqtci7oztx5a"
-    us-ashburn-1 = "ocid1.image.oc1.iad.aaaaaaaavxqdkuyamlnrdo3q7qa7q3tsd6vnyrxjy3nmdbpv7fs7um53zh5q"
-    us-phoenix-1 = "ocid1.image.oc1.phx.aaaaaaaapxvrtwbpgy3lchk2usn462ekarljwg4zou2acmundxlkzdty4bjq"
-  }
-}
-

terraform/modules/worker/main.tf

@@ -10,7 +10,7 @@ resource "oci_core_instance" "Worker" {
 
   source_details {
     source_type             = "image"
-    source_id               = "${var.InstanceImageOCID[var.region]}"
+    source_id               = "${var.image_ocid}"
   }
 
   metadata {

terraform/modules/worker/variables.tf

@@ -12,6 +12,7 @@ variable "ssh_private_key" {}
 variable "instances" {}
 variable "subnet_id" {}
 variable "user_data" {}
+variable "image_ocid" {}
 
 # ---------------------------------------------------------------------------------------------------------------------
 # Optional variables
@@ -90,7 +91,6 @@ variable "ssh_keypath" {
 # You probably don't need to change these.
 # ---------------------------------------------------------------------------------------------------------------------
 
-
 // Volume Mapping - used to map Worker Block Volumes consistently to the OS
 variable "data_volume_attachment_device" {
   type = "map"