CDPAUTO-102 Improve subnet CIDR calculation

cloudera-labs · Aug 7, 2023 · c55b538 · c55b538
1 parent beda186
commit c55b538
Show file tree

Hide file tree

Showing 6 changed files with 37 additions and 9 deletions.
diff --git a/modules/terraform-cdp-aws-pre-reqs/main.tf b/modules/terraform-cdp-aws-pre-reqs/main.tf
@@ -25,7 +25,9 @@ module "aws_cdp_vpc" {
   private_network_extensions = var.private_network_extensions
   env_prefix                 = var.env_prefix
   tags                       = local.env_tags
-
+
+  private_cidr_range = var.private_cidr_range
+  public_cidr_range = var.public_cidr_range
 }
 
 # ------- Security Groups -------

diff --git a/modules/terraform-cdp-aws-pre-reqs/modules/vpc/variables.tf b/modules/terraform-cdp-aws-pre-reqs/modules/vpc/variables.tf
@@ -21,15 +21,11 @@ variable "vpc_cidr" {
 variable "private_cidr_range" {
   type        = number
   description = "Size of each private subnet"
-
-  default = 19
 }
 
 variable "public_cidr_range" {
   type        = number
   description = "Size of each public subnet"
-
-  default = 24
 }
 
 variable "tags" {

diff --git a/modules/terraform-cdp-aws-pre-reqs/variables.tf b/modules/terraform-cdp-aws-pre-reqs/variables.tf
@@ -90,11 +90,25 @@ variable "create_vpc" {
 
 variable "vpc_cidr" {
   type        = string
-  description = "VPC CIDR Block"
+  description = "VPC CIDR Block. Required if create_vpc is true."
 
   default = "10.10.0.0/16"
 }
 
+variable "private_cidr_range" {
+  type        = number
+  description = "Size of each private subnet. Required if create_vpc is true. Number of subnets will be automatically selected to match on the number of Availability Zones in the selected AWS region. (Depending on the selected deployment pattern, one subnet will be created per region.)"
+
+  default = 19
+}
+
+variable "public_cidr_range" {
+  type        = number
+  description = "Size of each public subnet. Required if create_vpc is true. Number of subnets will be automatically selected to match on the number of Availability Zones in the selected AWS region. (Depending on the selected deployment pattern, one subnet will be created per region.)"
+
+  default = 24
+}
+
 variable "private_network_extensions" {
   type = bool
 

diff --git a/modules/terraform-cdp-azure-pre-reqs/main.tf b/modules/terraform-cdp-azure-pre-reqs/main.tf
@@ -39,6 +39,10 @@ module "azure_cdp_vnet" {
 
   env_prefix = var.env_prefix
   tags       = local.env_tags
+
+  cdp_subnet_range = var.cdp_subnet_range
+  gateway_subnet_range = var.gateway_subnet_range
+
 }
 
 

diff --git a/modules/terraform-cdp-azure-pre-reqs/modules/vnet/variables.tf b/modules/terraform-cdp-azure-pre-reqs/modules/vnet/variables.tf
@@ -44,14 +44,12 @@ variable "cdp_subnet_range" {
   type        = number
   description = "Size of each (internal) cluster subnet"
 
-  default = 19
 }
 
 variable "gateway_subnet_range" {
   type        = number
   description = "Size of each gateway subnet"
 
-  default = 24  
 }
 
 variable "vnet_region" {

diff --git a/modules/terraform-cdp-azure-pre-reqs/variables.tf b/modules/terraform-cdp-azure-pre-reqs/variables.tf
@@ -89,11 +89,25 @@ variable "vnet_name" {
 
 variable "vnet_cidr" {
   type        = string
-  description = "VNet CIDR Block"
+  description = "VNet CIDR Block. Required if create_vpc is true."
 
   default = "10.10.0.0/16"
 }
 
+variable "cdp_subnet_range" {
+  type        = number
+  description = "Size of each (internal) cluster subnet. Required if create_vpc is true."
+
+  default = 19
+}
+
+variable "gateway_subnet_range" {
+  type        = number
+  description = "Size of each gateway subnet. Required if create_vpc is true."
+
+  default = 24  
+}
+
 variable "cdp_resourcegroup_name" {
   type        = string
   description = "Pre-existing Resource Group for CDP environment. Required if create_vnet is false."