Small fixes to DP
This commit is contained in:
parent
c63ddb96f9
commit
73c2233b9b
|
@ -180,13 +180,13 @@ Due to its simplicity, this stage lends itself easily to customizations: adding
|
|||
|
||||
| name | description | sensitive | consumers |
|
||||
|---|---|:---:|---|
|
||||
| [dataplatform](outputs.tf#L114) | Data for the Data Platform stage. | | <code>03-dataplatform</code> |
|
||||
| [networking](outputs.tf#L131) | Data for the networking stage. | | |
|
||||
| [project_factories](outputs.tf#L140) | Data for the project factories stage. | | |
|
||||
| [providers](outputs.tf#L156) | Terraform provider files for this stage and dependent stages. | ✓ | <code>02-networking</code> · <code>02-security</code> · <code>03-dataplatform</code> · <code>xx-sandbox</code> · <code>xx-teams</code> |
|
||||
| [sandbox](outputs.tf#L163) | Data for the sandbox stage. | | <code>xx-sandbox</code> |
|
||||
| [security](outputs.tf#L173) | Data for the networking stage. | | <code>02-security</code> |
|
||||
| [teams](outputs.tf#L183) | Data for the teams stage. | | |
|
||||
| [tfvars](outputs.tf#L196) | Terraform variable files for the following stages. | ✓ | |
|
||||
| [dataplatform](outputs.tf#L114) | Data for the Data Platform stage. | | |
|
||||
| [networking](outputs.tf#L130) | Data for the networking stage. | | |
|
||||
| [project_factories](outputs.tf#L139) | Data for the project factories stage. | | |
|
||||
| [providers](outputs.tf#L155) | Terraform provider files for this stage and dependent stages. | ✓ | <code>02-networking</code> · <code>02-security</code> · <code>03-dataplatform</code> · <code>xx-sandbox</code> · <code>xx-teams</code> |
|
||||
| [sandbox](outputs.tf#L162) | Data for the sandbox stage. | | <code>xx-sandbox</code> |
|
||||
| [security](outputs.tf#L172) | Data for the networking stage. | | <code>02-security</code> |
|
||||
| [teams](outputs.tf#L182) | Data for the teams stage. | | |
|
||||
| [tfvars](outputs.tf#L195) | Terraform variable files for the following stages. | ✓ | |
|
||||
|
||||
<!-- END TFDOC -->
|
||||
|
|
|
@ -66,10 +66,7 @@ module "organization" {
|
|||
"roles/orgpolicy.policyAdmin" = local.branch_teams_pf_sa_iam_emails
|
||||
},
|
||||
local.billing_org ? {
|
||||
"roles/billing.costsManager" = concat(
|
||||
local.branch_dataplatform_sa_iam_emails,
|
||||
local.branch_teams_pf_sa_iam_emails
|
||||
)
|
||||
"roles/billing.costsManager" = local.branch_teams_pf_sa_iam_emails
|
||||
"roles/billing.user" = concat(
|
||||
[
|
||||
module.branch-network-sa.iam_email,
|
||||
|
|
|
@ -112,7 +112,6 @@ resource "local_file" "tfvars" {
|
|||
# outputs
|
||||
|
||||
output "dataplatform" {
|
||||
# tfdoc:output:consumers 03-dataplatform
|
||||
description = "Data for the Data Platform stage."
|
||||
value = {
|
||||
dev = {
|
||||
|
|
|
@ -1,8 +0,0 @@
|
|||
# skip boilerplate check
|
||||
|
||||
region: europe-west1
|
||||
description: Default subnet for prod Data Platform
|
||||
ip_cidr_range: 10.64.80.0/24
|
||||
secondary_ip_range:
|
||||
pods: 100.64.80.0/20
|
||||
services: 100.255.80.0/24
|
|
@ -1,8 +0,0 @@
|
|||
# skip boilerplate check
|
||||
|
||||
region: europe-west1
|
||||
description: Default subnet for prod Data Platform
|
||||
ip_cidr_range: 10.64.80.0/24
|
||||
secondary_ip_range:
|
||||
pods: 100.64.80.0/20
|
||||
services: 100.255.80.0/24
|
Loading…
Reference in New Issue