Added cluster name selection to Terraform schema rather than defined in script

Author: smithzc

compute.tf

@@ -41,6 +41,7 @@ module "utility" {
 	block_volume_count = "${var.block_volumes_per_worker}"
 	AD = "${var.availability_domain}"
 	deployment_type = "${var.deployment_type}"
+	cluster_name = "${var.cluster_name}"
 }
 
 module "master" {

modules/utility/main.tf

@@ -22,6 +22,7 @@ resource "oci_core_instance" "Utility" {
     block_volume_count  = "${var.block_volume_count}"	
     availability_domain = "${var.AD}"
     deployment_type     = "${var.deployment_type}"
+    cluster_name	= "${var.cluster_name}"
   }
 
   extended_metadata {

modules/utility/variables.tf

@@ -21,6 +21,7 @@ variable "cloudera_manager" {}
 variable "cm_install" {}
 variable "deploy_on_oci" {}
 variable "deployment_type" {}
+variable "cluster_name" {}
 
 # ---------------------------------------------------------------------------------------------------------------------
 # Optional variables

scripts/cms_mysql.sh

@@ -14,6 +14,7 @@ availability_domain=`curl -L http://169.254.169.254/opc/v1/instance/metadata/ava
 worker_shape=`curl -L http://169.254.169.254/opc/v1/instance/metadata/worker_shape`
 worker_disk_count=`curl -L http://169.254.169.254/opc/v1/instance/metadata/block_volume_count`
 deployment_type=`curl -L http://169.254.169.254/opc/v1/instance/metadata/deployment_type`
+cluster_name=`curl -L http://169.254.169.254/opc/v1/instance/metadata/cluster_name`
 EXECNAME="TUNING"
 log "-> START"
 sed -i.bak 's/SELINUX=enforcing/SELINUX=disabled/g' /etc/selinux/config
@@ -387,11 +388,6 @@ for w in `seq 1 $num_workers`; do
 done;
 log "-->Host List: ${fqdn_list}"
 log "-->Cluster Build"
-if [ ${deployment_type} = "simple" ]; then 
-	log "---> python /var/lib/cloud/instance/scripts/deploy_on_oci.py -S -m ${cm_ip} -i ${fqdn_list} -d ${worker_disk_count} -w ${worker_shape} -n ${num_workers} -cdh ${cdh_version} -ad ${availability_domain}"
-	python /var/lib/cloud/instance/scripts/deploy_on_oci.py -S -m ${cm_ip} -i ${fqdn_list} -d ${worker_disk_count} -w ${worker_shape} -n ${num_workers} -cdh ${cdh_version} -ad ${availability_domain} 2>&1 1>> $LOG_FILE
-else
-	log "---> python /var/lib/cloud/instance/scripts/deploy_on_oci.py -m ${cm_ip} -i ${fqdn_list} -d ${worker_disk_count} -w ${worker_shape} -n ${num_workers} -cdh ${cdh_version} -ad ${availability_domain}"
-        python /var/lib/cloud/instance/scripts/deploy_on_oci.py -m ${cm_ip} -i ${fqdn_list} -d ${worker_disk_count} -w ${worker_shape} -n ${num_workers} -cdh ${cdh_version} -ad ${availability_domain} 2>&1 1>> $LOG_FILE
-fi
+log "---> python /var/lib/cloud/instance/scripts/deploy_on_oci.py -D ${deployment_type}  -m ${cm_ip} -i ${fqdn_list} -d ${worker_disk_count} -w ${worker_shape} -n ${num_workers} -cdh ${cdh_version} -ad ${availability_domain} -N ${cluster_name}"
+python /var/lib/cloud/instance/scripts/deploy_on_oci.py -D ${deployment_type} -m ${cm_ip} -i ${fqdn_list} -d ${worker_disk_count} -w ${worker_shape} -n ${num_workers} -cdh ${cdh_version} -ad ${availability_domain} -N ${cluster_name} 2>&1 1>> $LOG_FILE
 log "->DONE"

scripts/deploy_on_oci.py

@@ -34,7 +34,7 @@
 data_tiering = 'False'
 nvme_disks = 0
 cluster_version = '6.2.0'  # type: str
-simple_deployment = 'False'  # type: bool
+deployment_type = 'simple'  # type: str
 
 #
 # Custom Global Parameters - Customize below here
@@ -52,11 +52,11 @@
 cluster_name = 'TestCluster'  # type: str
 
 # Set this to 'True' (default) to enable secure cluster (Kerberos) functionality
-# Set this to 'False" to deploy an insecure cluster - This is automatically off for  simple_deployment
+# Set this to 'False" to deploy an insecure cluster - This is automatically off for simple deployment 
 secure_cluster = 'True'  # type: bool
 
 # Set this to 'False' if you do not want HDFS HA - useful for Development or if you want to save some setup time
-# This is automatically off for simple_deployment
+# This is automatically off for simple deployment
 hdfs_ha = 'True'  # type: bool
 
 # They should match what is in the Cloudera Manager CloudInit bootstrap file and instance boot files
@@ -2085,7 +2085,7 @@ def options_parser(args=None):
                                                                                  'OCI using cm_client with Cloudera '
                                                                                  'Manager API %s' % (cluster_version,
                                                                                                      api_version))
-    parser.add_argument('-S', '--simple_deployment', action='store_true', help='Simple, no HA or Kerberos at deployment')
+    parser.add_argument('-D', '--deployment_type', metavar='deployment_type', help='simple, no HA or Kerberos at deployment, or secure to enable both')
     parser.add_argument('-m', '--cm_server', metavar='cm_server', required='True',
                         help='Cloudera Manager IP to connect API using cm_client')
     parser.add_argument('-i', '--input_host_list', metavar='input_host_list',
@@ -2099,6 +2099,7 @@ def options_parser(args=None):
     parser.add_argument('-n', '--num_workers', metavar='num_workers', help='Number of Workers in Cluster')
     parser.add_argument('-cdh', '--cdh_version', metavar='cdh_version', help='CDH version to deploy')
     parser.add_argument('-ad', '--availability_domain', metavar='availability_domain', help='OCI Availability Domain')
+    parser.add_argument('-N', '--cluster_name', metavar='cluster_name', help='CDH Cluster Name')
     options = parser.parse_args(args)
     if not options.cm_server:
         print('Cloudera Manager Server IP required.')
@@ -2117,6 +2118,10 @@ def options_parser(args=None):
             print('OCI Availability Domain is required.')
             parser.print_help()
             exit(-1)
+        if options.cm_server and not options.cluster_name:
+            print('Cluster Name is required.')
+            parser.print_help()
+            exit(-1)
 
     if options.license_file:
         try:
@@ -2129,7 +2134,7 @@ def options_parser(args=None):
             sys.exit()
 
     return (options.cm_server, options.input_host_list, options.disk_count, options.license_file, options.worker_shape,
-            options.num_workers, options.simple_deployment, options.cdh_version, options.availability_domain)
+            options.num_workers, options.deployment_type, options.cdh_version, options.availability_domain, options.cluster_name)
 
 #
 # MAIN FUNCTION FOR CLUSTER DEPLOYMENT
@@ -2315,14 +2320,21 @@ def enable_kerberos():
 #
 
 if __name__ == '__main__':
-    cm_server, input_host_list, disk_count, license_file, worker_shape, num_workers, simple_deployment, cdh_version, cms_version =\
+    cm_server, input_host_list, disk_count, license_file, worker_shape, num_workers, deployment_type, cdh_version, cms_version, cluster_name =\
         options_parser(sys.argv[1:])
     if debug == 'True':
         print('cm_server = %s' % cm_server)
         print('input_host_list = %s' % input_host_list)
         print('disk_count = %s' % disk_count)
         print('license_file = %s' % license_file)
         print('worker_shape = %s' % worker_shape)
+        print('cluster_name = %s' % cluster_name)
+        print('deployment_type = %s' % deployment_type)
+    if deployment_type == 'simple':
+        hdfs_ha = 'False'
+        secure_cluster = 'False'
+    else:
+	pass
     user_name = 'admin'
     password = 'admin'
     print('->Building API Endpoints')
@@ -2348,14 +2360,14 @@ def enable_kerberos():
             time.sleep(30)
             wait_status = wait_status + '*'
 
-    if simple_deployment == 'True':
+    if deployment_type == 'simple':
         print('Simple Deployment Selected')
         print('Cluster Security and High Availabilty are DISABLED')
     else:
         print('Cluster Deployment options - HA: %s - Kerberos: %s' % (hdfs_ha, secure_cluster))
 
     build_cloudera_cluster()
-    if simple_deployment == 'True':
+    if deployment_type == 'simple':
         exit(0)
     else:
         if hdfs_ha == 'True':

variables.tf

@@ -79,6 +79,10 @@ variable "availability_domain" {
   default = "1"
 }
 
+variable "cluster_name" {
+  default = "TestCluster"
+}
+
 # ---------------------------------------------------------------------------------------------------------------------
 # Environmental variables
 # You probably want to define these as environmental variables.