Revert "Fixes for Terraform v0.12"

This reverts commit 08c297b.

Author: smithzc

terraform/compute.tf

@@ -1,5 +1,5 @@
 module "bastion" {
-	source	= "./modules/bastion"
+	source	= "modules/bastion"
 	instances = "1"
 	region = "${var.region}"
 	compartment_ocid = "${var.compartment_ocid}"
@@ -17,7 +17,7 @@ module "bastion" {
 }
 
 module "utility" {
-        source  = "./modules/utility"
+        source  = "modules/utility"
         instances = "1"
 	region = "${var.region}"
 	compartment_ocid = "${var.compartment_ocid}"
@@ -35,7 +35,7 @@ module "utility" {
 }
 
 module "master" {
-        source  = "./modules/master"
+        source  = "modules/master"
         instances = "${var.master_node_count}"
 	region = "${var.region}"
 	compartment_ocid = "${var.compartment_ocid}"
@@ -53,7 +53,7 @@ module "master" {
 }
 
 module "worker" {
-        source  = "./modules/worker"
+        source  = "modules/worker"
         instances = "${var.worker_node_count}"
 	region = "${var.region}"
 	compartment_ocid = "${var.compartment_ocid}"

terraform/modules/network/main.tf

@@ -76,39 +76,48 @@ resource "oci_core_security_list" "PublicSubnet" {
   }]
 
   ingress_security_rules = [{
-    {tcp_options = {
+    tcp_options {
       "max" = 7180
       "min" = 7180
     }
+
     protocol = "6"
     source   = "0.0.0.0/0"
-  },
-    {tcp_options = {
+  }]
+
+  ingress_security_rules = [{
+    tcp_options {
       "max" = 18088
       "min" = 18088
     }
+
     protocol = "6"
     source   = "0.0.0.0/0"
-  },
-    {tcp_options = {
+  }]
+
+  ingress_security_rules = [{
+    tcp_options {
       "max" = 19888
       "min" = 19888
     }
+
     protocol = "6"
     source   = "0.0.0.0/0"
-  },
+  }]
 
-    {tcp_options = {
+  ingress_security_rules = [{
+    tcp_options {
       "max" = 22
       "min" = 22
     }
+
     protocol = "6"
     source   = "0.0.0.0/0"
-  },
-  {
+  }]
+
+  ingress_security_rules = [{
     protocol = "6"
     source   = "${var.VPC-CIDR}"
-  }
   }]
 }
 
@@ -120,8 +129,9 @@ resource "oci_core_security_list" "PrivateSubnet" {
   egress_security_rules = [{
     destination = "0.0.0.0/0"
     protocol    = "6"
-  },
-  {
+  }]
+
+  egress_security_rules = [{
     protocol    = "6"
     destination = "${var.VPC-CIDR}"
   }]
@@ -143,7 +153,7 @@ resource "oci_core_security_list" "BastionSubnet" {
   }]
 
   ingress_security_rules = [{
-    tcp_options = {
+    tcp_options {
       "max" = 22
       "min" = 22
     }

terraform/network.tf

@@ -1,5 +1,5 @@
 module "network" { 
-	source			= "./modules/network"
+	source			= "modules/network"
 	tenancy_ocid		= "${var.tenancy_ocid}"
 	compartment_ocid 	= "${var.compartment_ocid}"
 	availability_domain	= "${var.availability_domain}"

terraform/outputs.tf

@@ -1 +1 @@
-output "DEPLOYMENT_COMMAND" { value = "python ../scripts/deploy_on_oci.py -B -m ${module.utility.public-ip} -d ${module.worker.block-volume-count} -w ${var.worker_instance_shape}" }
+output "DEPLOYMENT COMMAND" { value = "python ../scripts/deploy_on_oci.py -B -m ${module.utility.public-ip} -d ${module.worker.block-volume-count} -w ${var.worker_instance_shape}" }