Merge pull request #535 from GoogleCloudPlatform/jccb/pf-prefix
Use prefix for PF projects
This commit is contained in:
commit
05842c5989
|
@ -108,11 +108,12 @@ terraform apply
|
||||||
| name | description | type | required | default | producer |
|
| name | description | type | required | default | producer |
|
||||||
|---|---|:---:|:---:|:---:|:---:|
|
|---|---|:---:|:---:|:---:|:---:|
|
||||||
| [billing_account_id](variables.tf#L19) | Billing account id. | <code>string</code> | ✓ | | <code>00-bootstrap</code> |
|
| [billing_account_id](variables.tf#L19) | Billing account id. | <code>string</code> | ✓ | | <code>00-bootstrap</code> |
|
||||||
|
| [prefix](variables.tf#L44) | Prefix used for resources that need unique names. | <code>string</code> | ✓ | | <code>00-bootstrap</code> |
|
||||||
| [data_dir](variables.tf#L25) | Relative path for the folder storing configuration data. | <code>string</code> | | <code>"data/projects"</code> | |
|
| [data_dir](variables.tf#L25) | Relative path for the folder storing configuration data. | <code>string</code> | | <code>"data/projects"</code> | |
|
||||||
| [defaults_file](variables.tf#L38) | Relative path for the file storing the project factory configuration. | <code>string</code> | | <code>"data/defaults.yaml"</code> | |
|
| [defaults_file](variables.tf#L38) | Relative path for the file storing the project factory configuration. | <code>string</code> | | <code>"data/defaults.yaml"</code> | |
|
||||||
| [environment_dns_zone](variables.tf#L31) | DNS zone suffix for environment. | <code>string</code> | | <code>null</code> | <code>02-networking</code> |
|
| [environment_dns_zone](variables.tf#L31) | DNS zone suffix for environment. | <code>string</code> | | <code>null</code> | <code>02-networking</code> |
|
||||||
| [shared_vpc_self_link](variables.tf#L44) | Self link for the shared VPC. | <code>string</code> | | <code>null</code> | <code>02-networking</code> |
|
| [shared_vpc_self_link](variables.tf#L50) | Self link for the shared VPC. | <code>string</code> | | <code>null</code> | <code>02-networking</code> |
|
||||||
| [vpc_host_project](variables.tf#L51) | Host project for the shared VPC. | <code>string</code> | | <code>null</code> | <code>02-networking</code> |
|
| [vpc_host_project](variables.tf#L57) | Host project for the shared VPC. | <code>string</code> | | <code>null</code> | <code>02-networking</code> |
|
||||||
|
|
||||||
## Outputs
|
## Outputs
|
||||||
|
|
||||||
|
|
|
@ -47,6 +47,7 @@ module "projects" {
|
||||||
kms_service_agents = try(each.value.kms, {})
|
kms_service_agents = try(each.value.kms, {})
|
||||||
labels = try(each.value.labels, {})
|
labels = try(each.value.labels, {})
|
||||||
org_policies = try(each.value.org_policies, null)
|
org_policies = try(each.value.org_policies, null)
|
||||||
|
prefix = var.prefix
|
||||||
service_accounts = try(each.value.service_accounts, {})
|
service_accounts = try(each.value.service_accounts, {})
|
||||||
services = try(each.value.services, [])
|
services = try(each.value.services, [])
|
||||||
service_identities_iam = try(each.value.services_iam, {})
|
service_identities_iam = try(each.value.services_iam, {})
|
||||||
|
|
|
@ -41,6 +41,12 @@ variable "defaults_file" {
|
||||||
default = "data/defaults.yaml"
|
default = "data/defaults.yaml"
|
||||||
}
|
}
|
||||||
|
|
||||||
|
variable "prefix" {
|
||||||
|
# tfdoc:variable:source 00-bootstrap
|
||||||
|
description = "Prefix used for resources that need unique names."
|
||||||
|
type = string
|
||||||
|
}
|
||||||
|
|
||||||
variable "shared_vpc_self_link" {
|
variable "shared_vpc_self_link" {
|
||||||
# tfdoc:variable:source 02-networking
|
# tfdoc:variable:source 02-networking
|
||||||
description = "Self link for the shared VPC."
|
description = "Self link for the shared VPC."
|
||||||
|
|
Loading…
Reference in New Issue