Fixed networking for Bastion Service

Author: lfeldman

modules/wordpress/main.tf

@@ -423,10 +423,11 @@ resource "oci_core_instance" "bastion_instance" {
 
 
 resource "oci_bastion_bastion" "bastion-service" {
-  count                        = var.numberOfNodes > 1 && var.use_bastion_service ? 1 : 0
-  bastion_type                 = "STANDARD"
-  compartment_id               = var.compartment_ocid
-  target_subnet_id             = var.bastion_subnet_id
+  count            = var.numberOfNodes > 1 && var.use_bastion_service ? 1 : 0
+  bastion_type     = "STANDARD"
+  compartment_id   = var.compartment_ocid
+  target_subnet_id = var.wp_subnet_id
+  #target_subnet_id             = var.bastion_subnet_id
   client_cidr_block_allow_list = ["0.0.0.0/0"]
   name                         = "BastionService4WP"
   max_session_ttl_in_seconds   = 10800

network.tf

@@ -196,7 +196,7 @@ resource "oci_core_subnet" "lb_subnet_public" {
 }
 
 resource "oci_core_subnet" "bastion_subnet_public" {
-  count             = var.numberOfNodes > 1 ? 1 : 0
+  count             = (var.numberOfNodes > 1 && var.use_bastion_service == false) ? 1 : 0
   cidr_block        = cidrsubnet(var.vcn_cidr, 8, 1)
   display_name      = "bastion_public_subnet"
   compartment_id    = var.compartment_ocid

schema.yaml

@@ -1,4 +1,4 @@
-title: "Deploy WordPress CMD on OCI with MDS"
+title: "Deploy WordPress CMS on OCI with MDS"
 stackDescription: "Deploy WordPress CMS on OCI with MySQL Database Service"
 schemaVersion: 1.2.0
 version: "20201104"

tags.tf

@@ -24,7 +24,7 @@ resource "oci_identity_tag" "ArchitectureCenterTag" {
 
   validator {
     validator_type = "ENUM"
-    values         = ["release", "1.3"]
+    values         = ["release", "1.4"]
   }
 
   provisioner "local-exec" {

variables.tf

@@ -29,7 +29,7 @@ variable "flex_lb_max_shape" {
 
 variable "release" {
   description = "Reference Architecture Release (OCI Architecture Center)"
-  default     = "1.3"
+  default     = "1.4"
 }
 
 variable "vcn" {

wordpress.tf

@@ -17,7 +17,7 @@ module "wordpress" {
   display_name              = "wordpress"
   wp_subnet_id              = oci_core_subnet.wp_subnet.id
   lb_subnet_id              = var.numberOfNodes > 1 ? oci_core_subnet.lb_subnet_public[0].id : ""
-  bastion_subnet_id         = var.numberOfNodes > 1 ? oci_core_subnet.bastion_subnet_public[0].id : ""
+  bastion_subnet_id         = (var.numberOfNodes > 1 && var.use_bastion_service == false) ? oci_core_subnet.bastion_subnet_public[0].id : ""
   fss_subnet_id             = var.numberOfNodes > 1 && var.use_shared_storage ? oci_core_subnet.fss_subnet_private[0].id : ""
   ssh_authorized_keys       = var.ssh_public_key
   mds_ip                    = module.mds-instance.private_ip