Fix for deploying to existing VCN & Subnets

Author: smithzc

modules/network/outputs.tf

@@ -1,19 +1,19 @@
 output "vcn-id" {
-	value = "${oci_core_vcn.cloudera_vcn.0.id}"
+	value = "${var.useExistingVcn ? var.myVcn : oci_core_vcn.cloudera_vcn.0.id}"
 }
 
 output "private-id" {
-	value = "${oci_core_subnet.private.0.id}"
+	value = "${var.useExistingVcn ? var.clusterSubnet : oci_core_subnet.private.0.id}"
 }
 
 output "public-id" {
-        value = "${oci_core_subnet.public.0.id}"
+        value = "${var.useExistingVcn ? var.utilitySubnet : oci_core_subnet.public.0.id}"
 }
 
 output "bastion-id" {
-        value = "${oci_core_subnet.bastion.0.id}"
+        value = "${var.useExistingVcn ? var.bastionSubnet : oci_core_subnet.bastion.0.id}"
 }
 
 output "blockvolume-id" {
-	value = "${oci_core_subnet.blockvolume.0.id}"
+	value = "${var.useExistingVcn ? var.blockvolumeSubnet : oci_core_subnet.blockvolume.0.id}"
 }

modules/network/variables.tf

@@ -25,6 +25,19 @@ variable "public_cidr" {}
 variable "private_cidr" {}
 variable "blockvolume_cidr" {}
 variable "enable_secondary_vnic" {}
+variable "myVcn" {}
+variable "clusterSubnet" {
+  default = " "
+}
+variable "bastionSubnet" {
+  default = " "
+}
+variable "utilitySubnet" {
+  default = " "
+}
+variable "blockvolumeSubnet" {
+  default = " "
+}
 # ---------------------------------------------------------------------------------------------------------------------
 # Optional variables
 # You can modify these.

network.tf

@@ -28,4 +28,9 @@ module "network" {
   blockvolume_cidr = "${var.blockvolume_cidr}"
   custom_vcn = ["${var.myVcn}"]
   enable_secondary_vnic = "${var.enable_secondary_vnic}"
+  clusterSubnet = "${var.clusterSubnet}"
+  bastionSubnet = "${var.bastionSubnet}"
+  utilitySubnet = "${var.utilitySubnet}"
+  blockvolumeSubnet = "${var.blockvolumeSubnet}"
+  myVcn = "${var.myVcn}"
 }