Updates for byo-VPC in GCP deployment

Signed-off-by: Jim Enright <[email protected]>
cloudera-labs · Dec 21, 2023 · fb6de34 · fb6de34
1 parent 5e41b52
commit fb6de34
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 30 deletions.
diff --git a/modules/terraform-cdp-deploy/examples/ex03-gcp-basic/main.tf b/modules/terraform-cdp-deploy/examples/ex03-gcp-basic/main.tf
@@ -28,12 +28,10 @@ module "cdp_gcp_prereqs" {
 
   ingress_extra_cidrs_and_ports = var.ingress_extra_cidrs_and_ports
 
-  # Inputs for BYO-VNet
-  # create_vnet            = var.create_vnet
-  # cdp_resourcegroup_name = var.cdp_resourcegroup_name
-  # cdp_vnet_name          = var.cdp_vnet_name
-  # cdp_subnet_names       = var.cdp_subnet_names
-  # cdp_gw_subnet_names    = var.cdp_gw_subnet_names
+  # Inputs for BYO-VPC
+  create_vpc       = var.create_vpc
+  cdp_vpc_name     = var.cdp_vpc_name
+  cdp_subnet_names = var.cdp_subnet_names
 
 }
 

diff --git a/modules/terraform-cdp-deploy/examples/ex03-gcp-basic/terraform.tfvars.sample b/modules/terraform-cdp-deploy/examples/ex03-gcp-basic/terraform.tfvars.sample
@@ -29,9 +29,7 @@ deployment_template = "<ENTER_VALUE>"  # Specify the deployment pattern below. O
 # ------- Optional inputs for BYO-VPC -------
 # **NOTE: Uncomment below settings if required
 
-# create_vpc=true # Set to false to use pre-existing VNet
+# create_vpc=true # Set to false to use pre-existing VPC
 
-# cdp_resourcegroup_name="<ENTER_EXISTING_RG_NAME>" # Name of pre-existing Resource Group for CDP environment. Required if create_vnet is false
-# cdp_vnet_name="<ENTER_EXISTING_VNET_NAME>" # Name of pre-existing VNet for CDP environment. Required if create_vnet is false
-# cdp_subnet_names=["<ENTER_EXISTING_SUBNET_NAME>","<ENTER_EXISTING_SUBNET_NAME>"] # List of pre-existing subnet names for CDP resources. Required if create_vnet is false
-# cdp_gw_subnet_names=["<ENTER_EXISTING_SUBNET_NAME>"] # List of pre-existing subnet names for CDP Gateway. Required if create_vnet is false
+# cdp_vpc_name="<ENTER_EXISTING_VPC_NAME>" # Name of pre-existing VNet for CDP environment. Required if create_vpc is false
+# cdp_subnet_names=["<ENTER_EXISTING_SUBNET_NAME>","<ENTER_EXISTING_SUBNET_NAME>"] # List of pre-existing subnet names for CDP resources. Required if create_vpc is false
diff --git a/modules/terraform-cdp-deploy/examples/ex03-gcp-basic/variables.tf b/modules/terraform-cdp-deploy/examples/ex03-gcp-basic/variables.tf
@@ -51,38 +51,24 @@ variable "ingress_extra_cidrs_and_ports" {
 }
 
 # ------- Optional inputs for BYO-VPC -------
-variable "create_vnet" {
+variable "create_vpc" {
   type = bool
 
-  description = "Flag to specify if the VNet should be created"
+  description = "Flag to specify if the VPC should be created"
 
   default = true
 }
 
-variable "cdp_resourcegroup_name" {
+variable "cdp_vpc_name" {
   type        = string
-  description = "Pre-existing Resource Group for CDP environment. Required if create_vnet is false."
-
-  default = null
-}
-
-variable "cdp_vnet_name" {
-  type        = string
-  description = "Pre-existing VNet Name for CDP environment. Required if create_vnet is false."
+  description = "Pre-existing VPC Name for CDP environment. Required if create_vpc is false."
 
   default = null
 }
 
 variable "cdp_subnet_names" {
   type        = list(any)
-  description = "List of subnet names for CDP Resources. Required if create_vnet is false."
+  description = "List of subnet names for CDP Resources. Required if create_vpc is false."
 
   default = null
 }
-
-variable "cdp_gw_subnet_names" {
-  type        = list(any)
-  description = "List of subnet names for CDP Gateway. Required if create_vnet is false."
-
-  default = null
-}