General Cleanup - Removed some variables which were no longer required.

Author: smithzc

README.md

@@ -11,6 +11,10 @@ Future development will include support for EDH v5 clusters.  In the meantime, u
 
 Host types can be customized in this template.   Also included with this template is an easy method to customize block volume quantity and size as pertains to HDFS capacity.   See [variables.tf](https://github.com/oracle/oci-quickstart-cloudera/blob/master/terraform/variables.tf#L48-L62)  for more information in-line.
 
+This file also allows customization of which version of Cloudera Manager and Cloudera Enterprise Data Hub is being deployed.  Before modifying these versions, it is encouraged you check the [Supported Upgrade Paths](https://www.cloudera.com/documentation/enterprise/upgrade/topics/ug_upgrade_paths.html) to ensure the version of Cloudera Manager you are deploying will support the EDH Cluster version.  It is recommended to use the latest version of Cloudera Manager regardless of which EDH version you wish to deploy.   
+
+Note that this deployment WILL NOT support Cloudera Manager versions less than v6, as they use the older v19 API which is deprecated.
+
 ## Prerequisites
 First off you'll need to do some pre deploy setup.  That's all detailed [here](https://github.com/oracle/oci-quickstart-prerequisites).
 

terraform/compute.tf

@@ -6,10 +6,8 @@ module "bastion" {
 	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.InstanceImageOCID[var.region]}"
-	ssh_keypath = "${var.ssh_keypath}" 
         ssh_private_key = "${var.ssh_private_key}"
 	ssh_public_key = "${var.ssh_public_key}"
-	private_key_path = "${var.private_key_path}"
 	bastion_instance_shape = "${var.bastion_instance_shape}" 
         log_volume_size_in_gbs = "${var.log_volume_size_in_gbs}"
         cloudera_volume_size_in_gbs = "${var.cloudera_volume_size_in_gbs}"
@@ -28,10 +26,8 @@ module "utility" {
         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.InstanceImageOCID[var.region]}"
-	ssh_keypath = "${var.ssh_keypath}"
 	ssh_private_key = "${var.ssh_private_key}"
         ssh_public_key = "${var.ssh_public_key}"
-        private_key_path = "${var.private_key_path}"
         utility_instance_shape = "${var.utility_instance_shape}"
         log_volume_size_in_gbs = "${var.log_volume_size_in_gbs}"
         cloudera_volume_size_in_gbs = "${var.cloudera_volume_size_in_gbs}"
@@ -55,10 +51,8 @@ module "master" {
         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.InstanceImageOCID[var.region]}"
-	ssh_keypath = "${var.ssh_keypath}"
         ssh_private_key = "${var.ssh_private_key}"
         ssh_public_key = "${var.ssh_public_key}"
-        private_key_path = "${var.private_key_path}"
         master_instance_shape = "${var.master_instance_shape}"
         log_volume_size_in_gbs = "${var.log_volume_size_in_gbs}"
         cloudera_volume_size_in_gbs = "${var.cloudera_volume_size_in_gbs}"
@@ -77,10 +71,8 @@ module "worker" {
         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.InstanceImageOCID[var.region]}"
-        ssh_keypath = "${var.ssh_keypath}"
         ssh_private_key = "${var.ssh_private_key}"
         ssh_public_key = "${var.ssh_public_key}"
-        private_key_path = "${var.private_key_path}"
         worker_instance_shape = "${var.worker_instance_shape}"
 	log_volume_size_in_gbs = "${var.log_volume_size_in_gbs}"
 	cloudera_volume_size_in_gbs = "${var.cloudera_volume_size_in_gbs}"

terraform/modules/bastion/outputs.tf

@@ -6,7 +6,6 @@
 
 variable "region" {}
 variable "compartment_ocid" {}
-variable "private_key_path" {}
 variable "ssh_public_key" {}
 variable "ssh_private_key" {}
 variable "instances" {}
@@ -47,12 +46,6 @@ variable "bastion_instance_shape" {
   default = "VM.Standard2.8"
 }
 
-# Path to SSH Key
-
-variable "ssh_keypath" {
-  default = "/home/opc/.ssh/id_rsa"
-}
-
 # ---------------------------------------------------------------------------------------------------------------------
 # Constants
 # You probably don't need to change these.

terraform/modules/bastion/variables.tf

@@ -6,7 +6,6 @@
 
 variable "region" {}
 variable "compartment_ocid" {}
-variable "private_key_path" {}
 variable "ssh_public_key" {}
 variable "ssh_private_key" {}
 variable "instances" {}
@@ -60,12 +59,6 @@ variable "master_instance_shape" {
   default = "VM.Standard2.8"
 }
 
-# Path to SSH Key
-
-variable "ssh_keypath" {
-  default = "/home/opc/.ssh/id_rsa"
-}
-
 # ---------------------------------------------------------------------------------------------------------------------
 # Constants
 # You probably don't need to change these.

terraform/modules/master/variables.tf

@@ -6,7 +6,6 @@
 
 variable "region" {}
 variable "compartment_ocid" {}
-variable "private_key_path" {}
 variable "ssh_public_key" {}
 variable "ssh_private_key" {}
 variable "instances" {}
@@ -56,12 +55,6 @@ variable "utility_instance_shape" {
   default = "VM.Standard2.8"
 }
 
-# Path to SSH Key
-
-variable "ssh_keypath" {
-  default = "/home/opc/.ssh/id_rsa"
-}
-
 # ---------------------------------------------------------------------------------------------------------------------
 # Constants
 # You probably don't need to change these.

terraform/modules/utility/variables.tf

@@ -6,7 +6,6 @@
 
 variable "region" {}
 variable "compartment_ocid" {}
-variable "private_key_path" {}
 variable "ssh_public_key" {}
 variable "ssh_private_key" {}
 variable "instances" {}
@@ -85,12 +84,6 @@ variable "worker_instance_shape" {
   default = "BM.DenseIO2.52"
 }
 
-# Path to SSH Key
-
-variable "ssh_keypath" {
-  default = "/home/opc/.ssh/id_rsa"
-}
-
 # ---------------------------------------------------------------------------------------------------------------------
 # Constants
 # You probably don't need to change these.

terraform/modules/worker/variables.tf

@@ -14,22 +14,31 @@ variable "fingerprint" {}
 variable "region" {}
 variable "ssh_public_key" {}
 variable "ssh_private_key" {}
-variable "cm_install" { default = "" }
-variable "deploy_on_oci" { default = "" }
-variable "cloudera_manager" { default = "10.0.0.2"}
-variable "AD" { default="2" }
-variable "block_volume_count" { default = "3"}
+variable "private_key_path" {
+    default = "/home/opc/.ssh/id_rsa"
+}
+variable "AD" { 
+    default = "1" }
+variable "block_volume_count" { 
+    default = "3"
+}
 
 # ---------------------------------------------------------------------------------------------------------------------
 # Cloudera variables
 # You should modify these based on deployment requirements.
 # ---------------------------------------------------------------------------------------------------------------------
 # Cloudera Manager Version
-variable "cm_version" { default = "6.2.0" }
+variable "cm_version" { 
+    default = "6.2.0" 
+}
 # Cloudera Enterprise Data Hub Version
-variable "cdh_version" { default = "6.2.0" }
+variable "cdh_version" { 
+    default = "6.2.0" 
+}
 # Deployment type - set this to "simple" if you want to DISABLE High Availabilty and Kerberos Security
-variable "deployment_type" { default = "simple" }
+variable "deployment_type" { 
+    default = "simple" 
+}
 
 # ---------------------------------------------------------------------------------------------------------------------
 # Optional variables
@@ -61,16 +70,6 @@ variable "worker_instance_shape" {
   default = "BM.DenseIO2.52"
 }
 
-# Path to SSH Key used for deployment and host access
-
-variable "ssh_keypath" {
-  default = "/home/opc/.ssh/id_rsa"
-}
-
-variable "private_key_path" {
-  default = "/home/opc/.ssh/id_rsa"
-}
-
 #
 # Set Node Counts in this section
 #