Terraform variable dependency fixes, syntax fixes.

Author: smithzc

scripts/cm_boot_mysql.sh

@@ -383,7 +383,7 @@ for w in `seq 1 $num_workers`; do
 		worker_fqdn_list=`echo "${worker_fqdn_list},${worker_fqdn[$w]}"`
 	fi
 done;
-echo "curl -L http://169.254.169.254/opc/v1/instance/metadata/extended_metadata | base64 -d " >> $LOG_FILE
+echo "curl -L http://169.254.169.254/opc/v1/instance/metadata/deploy_on_oci | base64 -d " >> $LOG_FILE
 echo "python deploy_on_oci.py -B -S -m ${cm_ip} -i ${worker_fqdn_list} -d ${worker_disk_count} -w ${worker_shape} -n ${num_workers} -cdh ${cdh_version} -ad ${availability_domain}" >> $LOG_FILE
 EXECNAME="END"
 log "->DONE"

terraform/compute.tf

@@ -35,7 +35,7 @@ module "utility" {
         log_volume_size_in_gbs = "${var.log_volume_size_in_gbs}"
         cloudera_volume_size_in_gbs = "${var.cloudera_volume_size_in_gbs}"
         user_data = "${base64encode(file("../scripts/cm_boot_mysql.sh"))}"
-	extended_metadata = "${base64encode(gzip(file("../scripts/deploy_on_oci.py")))}"
+	deploy_on_oci = "${base64encode(gzip(file("../scripts/deploy_on_oci.py")))}"
         cloudera_manager = "cdh-utility-1.public${var.availability_domain}.${module.network.vcn-dn}"
         cm_version = "${var.cm_version}"
         cdh_version = "${var.cdh_version}"

terraform/modules/bastion/variables.tf

@@ -15,6 +15,7 @@ variable "user_data" {}
 variable "image_ocid" {}
 variable "cm_version" {}
 variable "cdh_version" {}
+variable "cloudera_manager" {}
 
 # ---------------------------------------------------------------------------------------------------------------------
 # Optional variables

terraform/modules/master/variables.tf

@@ -15,6 +15,7 @@ variable "user_data" {}
 variable "image_ocid" {}
 variable "cm_version" {}
 variable "cdh_version" {}
+variable "cloudera_manager" {}
 
 # ---------------------------------------------------------------------------------------------------------------------
 # Optional variables

terraform/modules/utility/main.tf

@@ -23,6 +23,10 @@ resource "oci_core_instance" "Utility" {
     availability_domain = "${var.AD}"
   }
 
+  extended_metadata {
+    deploy_on_oci = "${var.deploy_on_oci}"
+  }
+
   timeouts {
     create = "30m"
   }

terraform/modules/utility/variables.tf

@@ -17,6 +17,9 @@ variable "cm_version" {}
 variable "cdh_version" {}
 variable "worker_shape" {}
 variable "block_volume_count" {}
+variable "AD" {}
+variable "cloudera_manager" {}
+variable "deploy_on_oci" {}
 
 # ---------------------------------------------------------------------------------------------------------------------
 # Optional variables

terraform/modules/worker/variables.tf

@@ -15,6 +15,8 @@ variable "user_data" {}
 variable "image_ocid" {}
 variable "cm_version" {}
 variable "cdh_version" {}
+variable "cloudera_manager" {}
+variable "block_volume_count" {}
 
 # ---------------------------------------------------------------------------------------------------------------------
 # Optional variables

terraform/variables.tf

@@ -14,6 +14,10 @@ variable "fingerprint" {}
 variable "region" {}
 variable "ssh_public_key" {}
 variable "ssh_private_key" {}
+variable "extended_metdata" {}
+variable "cloudera_manager" {}
+variable "AD" {}
+variable "block_volume_count" {}
 
 # ---------------------------------------------------------------------------------------------------------------------
 # Cloudera variables