diff --git a/ha-modules/vpn/variables.tf b/ha-modules/vpn/variables.tf index b30393a..b0d54f8 100644 --- a/ha-modules/vpn/variables.tf +++ b/ha-modules/vpn/variables.tf @@ -80,7 +80,7 @@ variable "local_cidrs" { * Type: list(any) **/ variable "peer_cidrs" { - description = "List of peer CIDRs for the creation of VPN connection." + description = "Enter the list of remote peer CIDRs you want to connect through the VPN tunnel in the format as [\"x.x.x.x/x\",\"x.x.x.x/x\",...]\nFor example:\n1. Single peer_cidrs = [\"10.0.0.0/28\"]\n2. List of peer_cidrs = [\"10.0.0.0/28\",\"10.0.0.1/32\"]" type = list(any) } diff --git a/saz/README.md b/saz/README.md index 2005c46..077fdd9 100644 --- a/saz/README.md +++ b/saz/README.md @@ -8,7 +8,7 @@ If there is a requirement for extra ips please update the db_ip_count with extra | Name | Version | | ------------------------------------------------------------------------ | -------- | | [terraform](#requirement_terraform) | >= 1.1.2 | -| [ibm](#requirement_ibm) | 1.39.1 | +| [ibm](#requirement_ibm) | 1.45.0 | ## Providers diff --git a/saz/core_modules/bastion_compute.tf b/saz/core_modules/bastion_compute.tf index 6d24cd8..1fca919 100644 --- a/saz/core_modules/bastion_compute.tf +++ b/saz/core_modules/bastion_compute.tf @@ -82,7 +82,7 @@ resource "ibm_is_instance" "bastion" { security_groups = [ibm_is_security_group.bastion.id] } lifecycle { - prevent_destroy = false // toggle this to true before publish + prevent_destroy = true ignore_changes = [ user_data, ] diff --git a/saz/example.userinput.auto.tfvars b/saz/example.userinput.auto.tfvars index 32c84be..76c563d 100644 --- a/saz/example.userinput.auto.tfvars +++ b/saz/example.userinput.auto.tfvars @@ -355,10 +355,13 @@ # User should make the configuration update on their on-prem side VPN accordingly on the basis of IBM side VPN. # **/ # vpn_mode = "policy" +# # /** -# * List of peer CIDRs for the creation of VPN connection. +# * Enter the list of remote peer CIDRs you want to connect through the VPN tunnel in the format as ["x.x.x.x/x","x.x.x.x/x",...] # * IBM VPC CIDR and User’s on-prem subnet CIDR should NOT overlap if VPN is being used. -# * Example: peer_cidrs = ["10.248.128.32/28"] +# * Example: +# * Single peer_cidrs = ["10.0.0.0/28"] +# * List of peer_cidrs = ["10.0.0.0/28","10.0.0.1/32"] # **/ # peer_cidrs = ["x.x.x.x/x"] # @@ -372,4 +375,4 @@ # * The Key configured on the peer gateway. The key is usually a complex string similar to a password. # **/ # preshared_key = "VPNDemoPassword" -# /** + diff --git a/saz/placement_group_variables.tf b/saz/placement_group_variables.tf index 5a14b73..58e603a 100644 --- a/saz/placement_group_variables.tf +++ b/saz/placement_group_variables.tf @@ -11,7 +11,7 @@ * Desc: The strategy for Database servers placement group - host_spread: place on different compute hosts - power_spread: place on compute hosts that use different power sources. **/ variable "db_pg_strategy" { - description = "The strategy for Database servers placement group - host_spread: place on different compute hosts - power_spread: place on compute hosts that use different power sources." + description = "The strategy for Database servers placement group \n- host_spread: place on different compute hosts \n- power_spread: place on compute hosts that use different power sources." type = string validation { condition = contains(["host_spread", "power_spread"], var.db_pg_strategy) @@ -25,7 +25,7 @@ variable "db_pg_strategy" { * Desc: The strategy for Web servers placement group - host_spread: place on different compute hosts - power_spread: place on compute hosts that use different power sources. **/ variable "web_pg_strategy" { - description = "The strategy for Web servers placement group - host_spread: place on different compute hosts - power_spread: place on compute hosts that use different power sources." + description = "The strategy for Web servers placement group \n- host_spread: place on different compute hosts \n- power_spread: place on compute hosts that use different power sources." type = string validation { condition = contains(["host_spread", "power_spread"], var.web_pg_strategy) @@ -39,7 +39,7 @@ variable "web_pg_strategy" { * Desc: The strategy for App servers placement group - host_spread: place on different compute hosts - power_spread: place on compute hosts that use different power sources. **/ variable "app_pg_strategy" { - description = "The strategy for App servers placement group - host_spread: place on different compute hosts - power_spread: place on compute hosts that use different power sources." + description = "The strategy for App servers placement group \n- host_spread: place on different compute hosts \n- power_spread: place on compute hosts that use different power sources." type = string validation { condition = contains(["host_spread", "power_spread"], var.app_pg_strategy) diff --git a/saz/vpn_variables.tf b/saz/vpn_variables.tf index ff014c1..ffcb6c9 100644 --- a/saz/vpn_variables.tf +++ b/saz/vpn_variables.tf @@ -25,7 +25,7 @@ variable "vpn_mode" { * Type: list(any) **/ variable "peer_cidrs" { - description = "List of peer CIDRs for the creation of VPN connection." + description = "Enter the list of remote peer CIDRs you want to connect through the VPN tunnel in the format as [\"x.x.x.x/x\",\"x.x.x.x/x\",...]\nFor example:\n1. Single peer_cidrs = [\"10.0.0.0/28\"]\n2. List of peer_cidrs = [\"10.0.0.0/28\",\"10.0.0.1/32\"]" type = list(string) validation { condition = can([for ip in var.peer_cidrs : regex("^(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)/([9]|1[0-9]|2[0-9]|3[0-2])$", ip)])