remove gcve_region parameter

GoogleCloudPlatform · Feb 14, 2024 · dc6b39a · dc6b39a
1 parent 0cd9a90
commit dc6b39a
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 15 deletions.
diff --git a/examples/gcve-private-cloud/main.tf b/examples/gcve-private-cloud/main.tf
@@ -17,11 +17,11 @@
 module "gcve-private-cloud" {
   source                            = "../../modules/gcve-private-cloud"
   project                           = var.project
-  gcve_region                       = var.gcve_region
   gcve_zone                         = var.gcve_zone
   vmware_engine_network_name        = var.vmware_engine_network_name
   vmware_engine_network_type        = var.vmware_engine_network_type
   vmware_engine_network_description = var.vmware_engine_network_description
+  vmware_engine_network_location    = var.vmware_engine_network_location
   create_vmware_engine_network      = var.create_vmware_engine_network
   pc_name                           = var.pc_name
   pc_cidr_range                     = var.pc_cidr_range

diff --git a/examples/gcve-private-cloud/variables.tf b/examples/gcve-private-cloud/variables.tf
@@ -18,10 +18,6 @@ variable "project" {
   type        = string
   description = "Project where private cloud will be deployed"
 }
-variable "gcve_region" {
-  type        = string
-  description = "Region where private cloud will be deployed"
-}
 variable "gcve_zone" {
   type        = string
   description = "Zone where private cloud will be deployed"
@@ -43,6 +39,11 @@ variable "vmware_engine_network_description" {
   default     = "PC Network"
 }
 
+variable "vmware_engine_network_location" {
+  type        = string
+  description = "Location where vmware engine network will be deployed"
+}
+
 variable "create_vmware_engine_network" {
   type        = bool
   description = "Set this value to true if you want to create a vmware engine network,"

diff --git a/modules/gcve-private-cloud/variables.tf b/modules/gcve-private-cloud/variables.tf
@@ -18,10 +18,7 @@ variable "project" {
   type        = string
   description = "Project where private cloud will be deployed"
 }
-variable "vmware_engine_network_location" {
-  type        = string
-  description = "Region where vmware engine network will be deployed"
-}
+
 variable "gcve_zone" {
   type        = string
   description = "Zone where private cloud will be deployed"
@@ -43,6 +40,11 @@ variable "vmware_engine_network_description" {
   default     = "PC Network"
 }
 
+variable "vmware_engine_network_location" {
+  type        = string
+  description = "Location where vmware engine network will be deployed"
+}
+
 variable "create_vmware_engine_network" {
   type        = bool
   description = "Set this value to true if you want to create a vmware engine network,"

diff --git a/stages/01-privatecloud/01a-privatecloud/main.tf b/stages/01-privatecloud/01a-privatecloud/main.tf
@@ -17,11 +17,11 @@
 module "gcve-private-cloud" {
   source                            = "../../../modules/gcve-private-cloud"
   project                           = var.project
-  gcve_region                       = var.gcve_region
   gcve_zone                         = var.gcve_zone
   vmware_engine_network_name        = var.vmware_engine_network_name
   vmware_engine_network_type        = var.vmware_engine_network_type
   vmware_engine_network_description = var.vmware_engine_network_description
+  vmware_engine_network_location    = var.vmware_engine_network_location
   create_vmware_engine_network      = var.create_vmware_engine_network
   pc_name                           = var.pc_name
   pc_cidr_range                     = var.pc_cidr_range

diff --git a/stages/01-privatecloud/01a-privatecloud/terraform.tfvars.example b/stages/01-privatecloud/01a-privatecloud/terraform.tfvars.example
@@ -1,8 +1,9 @@
 project                           = "my-example-project"
-gcve_region                       = "asia-southeast1"
 gcve_zone                         = "asia-southeast1-a"
 vmware_engine_network_name        = "asia-southeast1-default"
 vmware_engine_network_description = "my-network-description"
+vmware_engine_network_location    = "global"
+vmware_engine_network_type        = "STANDARD"
 create_vmware_engine_network      = true
 pc_name                           = "my-private-cloud"
 pc_cidr_range                     = "10.0.0.0/22"

diff --git a/stages/01-privatecloud/01a-privatecloud/variables.tf b/stages/01-privatecloud/01a-privatecloud/variables.tf
@@ -18,10 +18,6 @@ variable "project" {
   type        = string
   description = "Project where private cloud will be deployed"
 }
-variable "gcve_region" {
-  type        = string
-  description = "Region where private cloud will be deployed"
-}
 variable "gcve_zone" {
   type        = string
   description = "Zone where private cloud will be deployed"
@@ -36,6 +32,11 @@ variable "vmware_engine_network_type" {
   description = "Type of the vmware engine network for the private cloud"
   default     = "LEGACY"
 }
+variable "vmware_engine_network_location" {
+  type        = string
+  description = "Location of the vmware engine network for the private cloud"
+  default     = "us-central1"
+}
 
 variable "vmware_engine_network_description" {
   type        = string