Merge pull request #58 from oracle/jlamillan/zero-based-index-issue

Jlamillan/zero based index issue
oracle · Nov 20, 2017 · 1a48b04 · 1a48b04
2 parents c9db547 + eff0ff3
commit 1a48b04
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/k8s-oci.tf b/k8s-oci.tf
@@ -361,8 +361,8 @@ module "k8smaster-public-lb" {
   is_private       = "${var.k8s_master_lb_access == "private" ? "true": "false"}"
 
   # Handle case where var.k8s_master_lb_access=public, but var.control_plane_subnet_access=private
-  k8smaster_subnet_0_id     = "${var.k8s_master_lb_access == "private" ? module.vcn.k8smaster_subnet_ad1_id: coalesce(join(" ", list(module.vcn.public_subnet_ad1_id)), join(" ", list(module.vcn.k8smaster_subnet_ad1_id)))}"
-  k8smaster_subnet_1_id     = "${var.k8s_master_lb_access == "private" ? "": coalesce(join(" ", list(module.vcn.public_subnet_ad2_id)), join(" ", list(module.vcn.k8smaster_subnet_ad2_id)))}"
+  k8smaster_subnet_0_id     = "${var.k8s_master_lb_access == "private" ? module.vcn.k8smaster_subnet_ad1_id: coalesce(join(" ", module.vcn.public_subnet_ad1_id), join(" ", list(module.vcn.k8smaster_subnet_ad1_id)))}"
+  k8smaster_subnet_1_id     = "${var.k8s_master_lb_access == "private" ? "": coalesce(join(" ", module.vcn.public_subnet_ad2_id), join(" ", list(module.vcn.k8smaster_subnet_ad2_id)))}"
   k8smaster_ad1_private_ips = "${module.instances-k8smaster-ad1.private_ips}"
   k8smaster_ad2_private_ips = "${module.instances-k8smaster-ad2.private_ips}"
   k8smaster_ad3_private_ips = "${module.instances-k8smaster-ad3.private_ips}"

diff --git a/network/vcn/outputs.tf b/network/vcn/outputs.tf
@@ -39,15 +39,15 @@ output "k8worker_subnet_ad3_id" {
 }
 
 output "public_subnet_ad1_id" {
-  value = "${oci_core_subnet.PublicSubnetAD1.0.id}"
+  value = "${oci_core_subnet.PublicSubnetAD1.*.id}"
 }
 
 output "public_subnet_ad2_id" {
-  value = "${oci_core_subnet.PublicSubnetAD2.0.id}"
+  value = "${oci_core_subnet.PublicSubnetAD2.*.id}"
 }
 
 output "public_subnet_ad3_id" {
-  value = "${oci_core_subnet.PublicSubnetAD3.0.id}"
+  value = "${oci_core_subnet.PublicSubnetAD3.*.id}"
 }
 
 output "nat_instance_ad1_private_ips" {