This repository was archived by the owner on May 13, 2024. It is now read-only.
File tree Expand file tree Collapse file tree 6 files changed +10
-9
lines changed Expand file tree Collapse file tree 6 files changed +10
-9
lines changed Original file line number Diff line number Diff line change @@ -423,10 +423,11 @@ resource "oci_core_instance" "bastion_instance" {
423
423
424
424
425
425
resource "oci_bastion_bastion" "bastion-service" {
426
- count = var. numberOfNodes > 1 && var. use_bastion_service ? 1 : 0
427
- bastion_type = " STANDARD"
428
- compartment_id = var. compartment_ocid
429
- target_subnet_id = var. bastion_subnet_id
426
+ count = var. numberOfNodes > 1 && var. use_bastion_service ? 1 : 0
427
+ bastion_type = " STANDARD"
428
+ compartment_id = var. compartment_ocid
429
+ target_subnet_id = var. wp_subnet_id
430
+ # target_subnet_id = var.bastion_subnet_id
430
431
client_cidr_block_allow_list = [" 0.0.0.0/0" ]
431
432
name = " BastionService4WP"
432
433
max_session_ttl_in_seconds = 10800
Original file line number Diff line number Diff line change @@ -196,7 +196,7 @@ resource "oci_core_subnet" "lb_subnet_public" {
196
196
}
197
197
198
198
resource "oci_core_subnet" "bastion_subnet_public" {
199
- count = var. numberOfNodes > 1 ? 1 : 0
199
+ count = ( var. numberOfNodes > 1 && var . use_bastion_service == false ) ? 1 : 0
200
200
cidr_block = cidrsubnet (var. vcn_cidr , 8 , 1 )
201
201
display_name = " bastion_public_subnet"
202
202
compartment_id = var. compartment_ocid
Original file line number Diff line number Diff line change 1
- title : " Deploy WordPress CMD on OCI with MDS"
1
+ title : " Deploy WordPress CMS on OCI with MDS"
2
2
stackDescription : " Deploy WordPress CMS on OCI with MySQL Database Service"
3
3
schemaVersion : 1.2.0
4
4
version : " 20201104"
Original file line number Diff line number Diff line change @@ -24,7 +24,7 @@ resource "oci_identity_tag" "ArchitectureCenterTag" {
24
24
25
25
validator {
26
26
validator_type = " ENUM"
27
- values = [" release" , " 1.3 " ]
27
+ values = [" release" , " 1.4 " ]
28
28
}
29
29
30
30
provisioner "local-exec" {
Original file line number Diff line number Diff line change @@ -29,7 +29,7 @@ variable "flex_lb_max_shape" {
29
29
30
30
variable "release" {
31
31
description = " Reference Architecture Release (OCI Architecture Center)"
32
- default = " 1.3 "
32
+ default = " 1.4 "
33
33
}
34
34
35
35
variable "vcn" {
Original file line number Diff line number Diff line change @@ -17,7 +17,7 @@ module "wordpress" {
17
17
display_name = " wordpress"
18
18
wp_subnet_id = oci_core_subnet. wp_subnet . id
19
19
lb_subnet_id = var. numberOfNodes > 1 ? oci_core_subnet. lb_subnet_public [0 ]. id : " "
20
- bastion_subnet_id = var. numberOfNodes > 1 ? oci_core_subnet. bastion_subnet_public [0 ]. id : " "
20
+ bastion_subnet_id = ( var. numberOfNodes > 1 && var . use_bastion_service == false ) ? oci_core_subnet. bastion_subnet_public [0 ]. id : " "
21
21
fss_subnet_id = var. numberOfNodes > 1 && var. use_shared_storage ? oci_core_subnet. fss_subnet_private [0 ]. id : " "
22
22
ssh_authorized_keys = var. ssh_public_key
23
23
mds_ip = module. mds-instance . private_ip
You can’t perform that action at this time.
0 commit comments