Merge pull request #563 from GoogleCloudPlatform/sruffilli-pf-fixes
FAST: Re-align PF vars post varpocalypse
This commit is contained in:
commit
6c47ba466f
|
@ -113,8 +113,8 @@ terraform apply
|
|||
| [data_dir](variables.tf#L28) | Relative path for the folder storing configuration data. | <code>string</code> | | <code>"data/projects"</code> | |
|
||||
| [defaults_file](variables.tf#L41) | Relative path for the file storing the project factory configuration. | <code>string</code> | | <code>"data/defaults.yaml"</code> | |
|
||||
| [environment_dns_zone](variables.tf#L34) | DNS zone suffix for environment. | <code>string</code> | | <code>null</code> | <code>02-networking</code> |
|
||||
| [shared_vpc_self_links](variables.tf#L58) | Self link for the shared VPC. | <code title="object({ dev-spoke-0 = string })">object({…})</code> | | <code>null</code> | <code>02-networking</code> |
|
||||
| [vpc_host_project_ids](variables.tf#L67) | Host project for the shared VPC. | <code title="object({ dev-spoke-0 = string })">object({…})</code> | | <code>null</code> | <code>02-networking</code> |
|
||||
| [host_project_ids](variables.tf#L67) | Host project for the shared VPC. | <code title="object({ dev-spoke-0 = string })">object({…})</code> | | <code>null</code> | <code>02-networking</code> |
|
||||
| [vpc_self_links](variables.tf#L58) | Self link for the shared VPC. | <code title="object({ dev-spoke-0 = string })">object({…})</code> | | <code>null</code> | <code>02-networking</code> |
|
||||
|
||||
## Outputs
|
||||
|
||||
|
|
|
@ -22,8 +22,8 @@ locals {
|
|||
_defaults_net = {
|
||||
billing_account_id = var.billing_account.id
|
||||
environment_dns_zone = var.environment_dns_zone
|
||||
shared_vpc_self_link = try(var.shared_vpc_self_links["dev-spoke-0"], null)
|
||||
vpc_host_project = try(var.vpc_host_project_ids["dev-spoke-0"], null)
|
||||
shared_vpc_self_link = try(var.vpc_self_links["dev-spoke-0"], null)
|
||||
vpc_host_project = try(var.host_project_ids["dev-spoke-0"], null)
|
||||
}
|
||||
defaults = merge(local._defaults, local._defaults_net)
|
||||
projects = {
|
||||
|
|
|
@ -55,7 +55,7 @@ variable "prefix" {
|
|||
}
|
||||
}
|
||||
|
||||
variable "shared_vpc_self_links" {
|
||||
variable "vpc_self_links" {
|
||||
# tfdoc:variable:source 02-networking
|
||||
description = "Self link for the shared VPC."
|
||||
type = object({
|
||||
|
@ -64,7 +64,7 @@ variable "shared_vpc_self_links" {
|
|||
default = null
|
||||
}
|
||||
|
||||
variable "vpc_host_project_ids" {
|
||||
variable "host_project_ids" {
|
||||
# tfdoc:variable:source 02-networking
|
||||
description = "Host project for the shared VPC."
|
||||
type = object({
|
||||
|
|
|
@ -24,7 +24,7 @@ module "projects" {
|
|||
id = "000000-111111-222222"
|
||||
organization_id = 123456789012
|
||||
}
|
||||
shared_vpc_self_links = {
|
||||
vpc_self_links = {
|
||||
dev-spoke-0 = "link"
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue