From 9076c2f2b014528922cb88db0d7626a5abd3d475 Mon Sep 17 00:00:00 2001
From: Julio Castillo <jccb@google.com>
Date: Fri, 11 Feb 2022 17:10:44 +0100
Subject: [PATCH] Fix external billing org

---
 fast/stages/01-resman/organization.tf | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/fast/stages/01-resman/organization.tf b/fast/stages/01-resman/organization.tf
index 7ab1780e..5c52c00c 100644
--- a/fast/stages/01-resman/organization.tf
+++ b/fast/stages/01-resman/organization.tf
@@ -52,9 +52,6 @@ module "organization" {
       "roles/accesscontextmanager.policyAdmin" = [
         module.branch-security-sa.iam_email
       ]
-      "roles/billing.costsManager" = concat(
-        local.branch_teams_pf_sa_iam_emails
-      ),
       "roles/compute.orgFirewallPolicyAdmin" = [
         module.branch-network-sa.iam_email
       ]
@@ -64,6 +61,7 @@ module "organization" {
       "roles/orgpolicy.policyAdmin" = local.branch_teams_pf_sa_iam_emails
     },
     local.billing_org ? {
+      "roles/billing.costsManager" = local.branch_teams_pf_sa_iam_emails
       "roles/billing.user" = concat(
         [
           module.branch-network-sa.iam_email,