From 8d95b9ede5af970deac0e07bafaac663a040f97e Mon Sep 17 00:00:00 2001 From: bottkars Date: Tue, 9 Apr 2024 14:37:12 +0200 Subject: [PATCH] Bumped Azure to 19.16 PPDM --- .gitignore | 1 + README.md | 17 ++++++++++++++++- terraforming-azure/README.md | 4 ++-- terraforming-azure/modules/ppdm/ppdm.tf | 6 ++++++ terraforming-azure/modules/s2s_vpn/outputs.tf | 2 +- terraforming-azure/nve_output.tf | 2 +- terraforming-azure/ppdm_variables.tf | 7 ++++--- terraforming-azure/s2s_vpn_output.tf | 10 +++++----- 8 files changed, 36 insertions(+), 13 deletions(-) diff --git a/.gitignore b/.gitignore index 94bd1a7..e5404cb 100644 --- a/.gitignore +++ b/.gitignore @@ -27,3 +27,4 @@ terraforming-gcp/default.sc.json terraforming-azure/terraform.tfvars.default.json terraforming-azure/terraform.tfvars.msdn.json terraforming-azure/terraform.tfvars.default.json +terraforming-azure/terraform.tfvars.crs.json diff --git a/README.md b/README.md index b355287..61b33dc 100644 --- a/README.md +++ b/README.md @@ -1,9 +1,24 @@ # terraforming-dps -This is the terrafrom repo to deploy Dell Technologies Dataprotection Appliances to Cloud using Terrafrom +This is the terraform repo to deploy Dell Technologies Dataprotection Appliances to Cloud using terrafrom See Subdirectories for Cloud Provider specific Deployments and getting started --- [terraforming-aws](./terraforming-aws/README.md) [terraforming-azure](./terraforming-azure/README.md) [terraforming-gcp](./terraforming-gcp/README.md) + + +## Contributing Guidelines +Contributions to this Repository are welcome, whether or not you work for Dell. Contributions may be: + +Improvements to or fixes for existing example code + +Updates to example documentation + +Complete example code for a use case not currently included + +Please note that pull requests that contribute new example code or update existing sample code in a way that affects usage should include documentation. + + + diff --git a/terraforming-azure/README.md b/terraforming-azure/README.md index 0cbb2ce..a8d143f 100644 --- a/terraforming-azure/README.md +++ b/terraforming-azure/README.md @@ -98,7 +98,7 @@ No resources. | [ppdm\_name](#input\_ppdm\_name) | Instances wiull be named envname+ppdmname+instanceid, e.g tfdemo-ppdm1 tfdemo-ppdm2 | `string` | `"ppdm"` | no | | [ppdm\_public\_ip](#input\_ppdm\_public\_ip) | must we assign a public ip to ppdm | `bool` | `false` | no | | [ppdm\_resource\_group\_name](#input\_ppdm\_resource\_group\_name) | Bring your own resourcegroup. the Code will read the Data from the resourcegroup name specified here | `string` | `null` | no | -| [ppdm\_version](#input\_ppdm\_version) | PPDM Version, can be: '19.15.0', '19.14.0' | `string` | `"19.15.0"` | no | +| [ppdm\_version](#input\_ppdm\_version) | PPDM Version, can be: '19.16.0','19.15.0', '19.14.0' | `string` | `"19.16.0"` | no | | [storage\_account\_cs](#input\_storage\_account\_cs) | Storage account when using custom script extension with linux | `string` | `null` | no | | [storage\_account\_key\_cs](#input\_storage\_account\_key\_cs) | Storage account key when using custom script extension with linux | `string` | `null` | no | | [subscription\_id](#input\_subscription\_id) | n/a | `any` | n/a | yes | @@ -273,7 +273,7 @@ ppdm_initial_password = "Change_Me12345_" ppdm_name = "ppdm" ppdm_public_ip = false ppdm_resource_group_name = "" -ppdm_version = "19.15.0" +ppdm_version = "19.16.0" storage_account_cs = "" storage_account_key_cs = "" subscription_id = "" diff --git a/terraforming-azure/modules/ppdm/ppdm.tf b/terraforming-azure/modules/ppdm/ppdm.tf index ba3bace..c238461 100644 --- a/terraforming-azure/modules/ppdm/ppdm.tf +++ b/terraforming-azure/modules/ppdm/ppdm.tf @@ -1,5 +1,11 @@ locals { ppdm_image = { + "19.16.0" = { + publisher = "dellemc" + offer = "ppdm_0_0_1" + sku = "powerprotect-data-manager-19-16-0-11" + version = "19.16.0" + } "19.15.0" = { publisher = "dellemc" offer = "ppdm_0_0_1" diff --git a/terraforming-azure/modules/s2s_vpn/outputs.tf b/terraforming-azure/modules/s2s_vpn/outputs.tf index da974b5..09bc0d0 100644 --- a/terraforming-azure/modules/s2s_vpn/outputs.tf +++ b/terraforming-azure/modules/s2s_vpn/outputs.tf @@ -1,3 +1,3 @@ output "vpn_public_ip" { - value = length(azurerm_virtual_network_gateway.s2s_vpn.bgp_settings[0].peering_addresses[0].tunnel_ip_addresses) > 0 ? azurerm_virtual_network_gateway.s2s_vpn.bgp_settings[0].peering_addresses[0].tunnel_ip_addresses[0] : "" + value = length(azurerm_public_ip.s2s_vpn.ip_address) > 0 ? azurerm_public_ip.s2s_vpn.ip_address : "" } diff --git a/terraforming-azure/nve_output.tf b/terraforming-azure/nve_output.tf index 0975a73..b459fc8 100644 --- a/terraforming-azure/nve_output.tf +++ b/terraforming-azure/nve_output.tf @@ -44,7 +44,7 @@ output "NVE_PRIVATE_FQDN" { output "nve_public_fqdn" { sensitive = false - value = var.nve_count > 0 && var.nve_public_ip ? module.nve[*].private_fqdn : module.nve[*].nve_private_ip_address + value = var.nve_count > 0 && var.nve_public_ip ? module.nve[*].private_fqdn : module.nve[*].nve_private_ip_address description = "the private FQDN of the NVE´s" } output "NVE_PUBLIC_FQDN" { diff --git a/terraforming-azure/ppdm_variables.tf b/terraforming-azure/ppdm_variables.tf index ae8bae5..49a2145 100644 --- a/terraforming-azure/ppdm_variables.tf +++ b/terraforming-azure/ppdm_variables.tf @@ -10,14 +10,15 @@ variable "ppdm_name" { variable "ppdm_version" { type = string - default = "19.15.0" - description = "PPDM Version, can be: '19.15.0', '19.14.0'" + default = "19.16.0" + description = "PPDM Version, can be: '19.16.0','19.15.0', '19.14.0'" validation { condition = anytrue([ + var.ppdm_version == "19.16.0", var.ppdm_version == "19.15.0", var.ppdm_version == "19.14.0", ]) - error_message = "Must be a valid PPDM Version, can be: '19.15.0', '19.14.0'." + error_message = "Must be a valid PPDM Version, can be: '19.16.0','19.15.0', '19.14.0'." } } variable "ppdm_resource_group_name" { diff --git a/terraforming-azure/s2s_vpn_output.tf b/terraforming-azure/s2s_vpn_output.tf index f0fae44..d6ddbc1 100644 --- a/terraforming-azure/s2s_vpn_output.tf +++ b/terraforming-azure/s2s_vpn_output.tf @@ -1,7 +1,7 @@ -#output "vpn_public_ip" { -# sensitive = false -# value = var.create_s2s_vpn ? module.s2s_vpn[0].vpn_public_ip : null -# description = "The IP of the VPN Vnet Gateway" -#} +output "vpn_public_ip" { + sensitive = false + value = var.create_s2s_vpn ? module.s2s_vpn[0].vpn_public_ip : null + description = "The IP of the VPN Vnet Gateway" +}