Merge branch 'master' into cf-v2-iam-fix
This commit is contained in:
commit
48e46515ea
|
@ -116,8 +116,7 @@ module "gcs-bucket" {
|
|||
module "gcs-bucket-cloudbuild" {
|
||||
source = "../../../modules/gcs"
|
||||
project_id = module.project.project_id
|
||||
name = "${var.prefix}_cloudbuild"
|
||||
prefix = var.prefix
|
||||
name = "${module.project.project_id}_cloudbuild"
|
||||
location = var.region
|
||||
storage_class = "REGIONAL"
|
||||
versioning = false
|
||||
|
@ -137,10 +136,10 @@ module "vpc-local" {
|
|||
count = local.use_shared_vpc ? 0 : 1
|
||||
source = "../../../modules/net-vpc"
|
||||
project_id = module.project.project_id
|
||||
name = "default"
|
||||
name = "vertex"
|
||||
subnets = [
|
||||
{
|
||||
"name" : "default",
|
||||
"name" : "subnet-${var.region}",
|
||||
"region" : "${var.region}",
|
||||
"ip_cidr_range" : "10.4.0.0/24",
|
||||
"secondary_ip_range" : null
|
||||
|
|
Loading…
Reference in New Issue