Add support for pre-existing VNet RG in Azure pre-reqs module

modules/terraform-cdp-azure-pre-reqs/README.md

@@ -75,10 +75,11 @@ In each directory an example `terraform.tfvars.sample` values file is included t
 | <a name="input_create_azure_cml_nfs"></a> [create\_azure\_cml\_nfs](#input\_create\_azure\_cml\_nfs) | Whether to create NFS for CML | `bool` | `false` | no |
 | <a name="input_create_azure_storage_network_rules"></a> [create\_azure\_storage\_network\_rules](#input\_create\_azure\_storage\_network\_rules) | Enable creation of network rules for the Azure Storage Accounts. | `bool` | `false` | no |
 | <a name="input_create_azure_storage_private_endpoints"></a> [create\_azure\_storage\_private\_endpoints](#input\_create\_azure\_storage\_private\_endpoints) | Flag to specify if Private Endpoints are created for each storage account. | `bool` | `true` | no |
+| <a name="input_create_cdp_resource_group"></a> [create\_cdp\_resource\_group](#input\_create\_cdp\_resource\_group) | Flag to specify if the Resource Group for Cloudera Resources should be created | `bool` | `true` | no |
 | <a name="input_create_delegated_subnet"></a> [create\_delegated\_subnet](#input\_create\_delegated\_subnet) | Flag to specify if the delegated subnet should be created. Only applicable if create\_vnet is true. | `bool` | `false` | no |
 | <a name="input_create_nat_gateway"></a> [create\_nat\_gateway](#input\_create\_nat\_gateway) | Flag to specify if the NAT Gateway should be created. Only applicable if create\_vnet is true. | `bool` | `true` | no |
+| <a name="input_create_network_resource_group"></a> [create\_network\_resource\_group](#input\_create\_network\_resource\_group) | Flag to specify if the Resource Group for Network Resources should be created. Note that if create\_vnet is false this must be false. Note that if separate\_network\_resource\_group is false this will not be used. | `bool` | `true` | no |
 | <a name="input_create_private_flexible_server_resources"></a> [create\_private\_flexible\_server\_resources](#input\_create\_private\_flexible\_server\_resources) | Flag to specify if resources to support a Private Postgres flexible server should be created. | `bool` | `null` | no |
-| <a name="input_create_resource_group"></a> [create\_resource\_group](#input\_create\_resource\_group) | Flag to specify if the Resource Group should be created | `bool` | `true` | no |
 | <a name="input_create_vm_mounting_nfs"></a> [create\_vm\_mounting\_nfs](#input\_create\_vm\_mounting\_nfs) | Whether to create a VM which mounts this NFS | `bool` | `true` | no |
 | <a name="input_create_vnet"></a> [create\_vnet](#input\_create\_vnet) | Flag to specify if the VNet should be created | `bool` | `true` | no |
 | <a name="input_data_storage"></a> [data\_storage](#input\_data\_storage) | Data storage locations for CDP environment | <pre>object({<br/>    data_storage_bucket = string<br/>    data_storage_object = string<br/>  })</pre> | `null` | no |

modules/terraform-cdp-azure-pre-reqs/examples/ex02-existing-rg/main.tf

@@ -45,8 +45,8 @@ module "ex04_existing_rg" {
   ingress_extra_cidrs_and_ports = var.ingress_extra_cidrs_and_ports
 
   # Used existing resource group
-  create_resource_group  = false
-  cdp_resourcegroup_name = azurerm_resource_group.rmgp.name
+  create_cdp_resource_group = false
+  cdp_resourcegroup_name    = azurerm_resource_group.rmgp.name
 
   depends_on = [azurerm_resource_group.rmgp]
 }

modules/terraform-cdp-azure-pre-reqs/main.tf

@@ -19,15 +19,18 @@ module "azure_cdp_rmgp" {
 
   source = "../terraform-azure-resource-group"
 
-  create_resource_group = (var.create_resource_group && var.create_vnet)
+  create_resource_group = (
+    var.create_cdp_resource_group &&
+    (var.create_vnet || var.separate_network_resource_group)
+  )
 
   # Variables required when creating RG
-  resourcegroup_name = (var.create_resource_group && var.create_vnet) ? local.cdp_resourcegroup_name : null
-  azure_region       = (var.create_resource_group && var.create_vnet) ? var.azure_region : null
-  tags               = (var.create_resource_group && var.create_vnet) ? var.env_tags : null
+  resourcegroup_name = (var.create_cdp_resource_group && (var.create_vnet || var.separate_network_resource_group)) ? local.cdp_resourcegroup_name : null
+  azure_region       = (var.create_cdp_resource_group && (var.create_vnet || var.separate_network_resource_group)) ? var.azure_region : null
+  tags               = (var.create_cdp_resource_group && (var.create_vnet || var.separate_network_resource_group)) ? var.env_tags : null
 
   # Variables required when using pre-existing RG
-  existing_resource_group_name = (var.create_resource_group && var.create_vnet) ? null : var.cdp_resourcegroup_name
+  existing_resource_group_name = (var.create_cdp_resource_group && (var.create_vnet || var.separate_network_resource_group)) ? null : var.cdp_resourcegroup_name
 
 }
 
@@ -37,15 +40,15 @@ module "azure_network_rmgp" {
 
   source = "../terraform-azure-resource-group"
 
-  create_resource_group = (var.create_resource_group && var.create_vnet)
+  create_resource_group = (var.create_network_resource_group && var.create_vnet)
 
   # Variables required when creating RG
-  resourcegroup_name = (var.create_resource_group && var.create_vnet) ? local.network_resourcegroup_name : null
-  azure_region       = (var.create_resource_group && var.create_vnet) ? var.azure_region : null
-  tags               = (var.create_resource_group && var.create_vnet) ? var.env_tags : null
+  resourcegroup_name = (var.create_network_resource_group && var.create_vnet) ? local.network_resourcegroup_name : null
+  azure_region       = (var.create_network_resource_group && var.create_vnet) ? var.azure_region : null
+  tags               = (var.create_network_resource_group && var.create_vnet) ? var.env_tags : null
 
   # Variables required when using pre-existing RG
-  existing_resource_group_name = (var.create_resource_group && var.create_vnet) ? null : var.network_resourcegroup_name
+  existing_resource_group_name = (var.create_network_resource_group && var.create_vnet) ? null : var.network_resourcegroup_name
 
 }
 

modules/terraform-cdp-azure-pre-reqs/variables.tf

@@ -108,10 +108,18 @@ variable "cdp_resourcegroup_name" {
 
 }
 
-variable "create_resource_group" {
+variable "create_cdp_resource_group" {
   type = bool
 
-  description = "Flag to specify if the Resource Group should be created"
+  description = "Flag to specify if the Resource Group for Cloudera Resources should be created"
+
+  default = true
+}
+
+variable "create_network_resource_group" {
+  type = bool
+
+  description = "Flag to specify if the Resource Group for Network Resources should be created. Note that if create_vnet is false this must be false. Note that if separate_network_resource_group is false this will not be used."
 
   default = true
 }