fmichaelobrien
commented
2 years ago diff --git a/environments/bootstrap/bootstrap.auto.tfvars b/environments/bootstrap/bootstrap.auto.tfvars
index 4524b35..e7e3d48 100644
--- a/environments/bootstrap/bootstrap.auto.tfvars
+++ b/environments/bootstrap/bootstrap.auto.tfvars
@@ -14,8 +14,10 @@
bootstrap = {
userDefinedString = "" # REQUIRED EDIT Appended to project name/id
additionalUserDefinedString = "" # OPTIONAL EDIT Additional appended string
- billingAccount = "" # REQUIRED EDIT Billing Account in the format of ######-######-######
- parent = "" # REQUIRED EDIT Node in format "organizations/#############" or "folders/#############"
+ billingAccount = "REPLACE_WITH_BILLING_ID" # REQUIRED EDIT Billing Account in the format of ######-######-######
+ # switch out root_node depending on whether you are running directly off the organization or a folder
+ #parent = "organizations/REPLACE_ORGANIZATION_ID" # REQUIRED EDIT Node in format "organizations/#############" or "folders/#############"
+ parent = "folders/REPLACE_FOLDER_ID" # REQUIRED EDIT Node in format "organizations/#############" or "folders/#############"
terraformDeploymentAccount = "" # REQUIRED EDIT Name of a service account to be created (alphanumeric before the at sign) used to deploy the terraform code
bootstrapEmail = "user:" # REQUIRED EDIT In the form of 'user:user@email.com
region = "" # REQUIRED EDIT Region name. northamerica-northeast1
diff --git a/environments/bootstrap/organization-config.auto.tfvars b/environments/bootstrap/organization-config.auto.tfvars
index c30ba19..50c7cb8 100644
--- a/environments/bootstrap/organization-config.auto.tfvars
+++ b/environments/bootstrap/organization-config.auto.tfvars
@@ -5,17 +5,19 @@
*/
organization_config = {
- org_id = "" # REQUIRED EDIT Numeric portion only '#############'"
+ org_id = "REPLACE_ORGANIZATION_ID" # REQUIRED EDIT Numeric portion only '#############'"
default_region = "" # REQUIRED EDIT Cloudbuild Region
department_code = "" # REQUIRED EDIT Two Characters. Capitol and then lowercase
owner = "" # REQUIRED EDIT Used in naming standard
environment = "" # REQUIRED EDIT S-Sandbox P-Production Q-Quality D-development
location = "" # REQUIRED EDIT Location used for resources. Currently northamerica-northeast1 is available
labels = {} # REQUIRED EDIT Object used for resource labels
- root_node = "" # REQUIRED EDIT format "organizations/#############" or "folders/#############"
+ #root_node = "organizations/REPLACE_ORGANIZATION_ID" # REQUIRED EDIT format "organizations/#############" or "folders/#############"
+ root_node = "folders/REPLACE_FOLDER_ID" # REQUIRED EDIT format "organizations/#############" or "folders/#############"
+
contacts = {
"user@email.com" = ["ALL"] # REQUIRED EDIT Essential Contacts for notifications. Must be in the form EMAIL -> [NOTIFICATION_TYPES]
}
- billing_account = "" # REQUIRED EDIT Format of ######-######-######
+ billing_account = "REPLACE_WITH_BILLING_ID" # REQUIRED EDIT Format of ######-######-######
}
diff --git a/environments/common/common.auto.tfvars b/environments/common/common.auto.tfvars
index de95cde..8bce00f 100644
--- a/environments/common/common.auto.tfvars
+++ b/environments/common/common.auto.tfvars
@@ -17,7 +17,9 @@ org_policies = {
]
}
folders = {
- parent = "" #REQUIRED Edit, format "organizations/#############" or "folders/#############"
+ # switch out parent depending on whether you are running directly off the organization or a folder
+ #parent = "organizations/REPLACE_ORGANIZATION_ID" #REQUIRED Edit, format "organizations/#############" or "folders/#############"
+ parent = "folders/REPLACE_FOLDER_ID" #REQUIRED Edit, format "organizations/#############" or "folders/#############"
names = ["Infrastructure", "Sandbox", "Workloads", "Audit and Security", "Automation", "Shared Services"] # Production, NonProduction and Platform are included in the module
subfolders_1 = {
SharedInfrastructure = "Infrastructure"
@@ -45,7 +47,7 @@ access_context_manager = { # REQUIRED OBJECT. VPC Service Controls object.
audit = { # REQUIRED OBJECT. Must include an audit object.
user_defined_string = "audit" # REQUIRED EDIT. Must be globally unique, used for the audit project
additional_user_defined_string = "" # OPTIONAL EDIT. Optionally append a value to the end of the user defined string.
- billing_account = "" # REQUIRED EDIT. Define the audit billing account
+ billing_account = "REPLACE_WITH_BILLING_ID" # REQUIRED EDIT. Define the audit billing account
audit_streams = {
prod = {
bucket_name = "" # REQUIRED EDIT. Must be globally unique, used for the audit bucket
@@ -96,7 +98,7 @@ folder_iam = [
organization_iam = [
{
member = "group:group@test.domain.net" # REQUIRED EDIT. user:user@google.com, group:users@google.com,serviceAccount:robot@PROJECT.iam.gserviceaccount.com
- organization = "" #Insert your Ord ID here, format ############
+ organization = "REPLACE_ORGANIZATION_ID" #Insert your Ord ID here, format ############
roles = [
"roles/viewer",
]
@@ -105,7 +107,7 @@ organization_iam = [
guardrails = {
user_defined_string = "guardrails" # Optional EDIT. Must be unique. Defines the guardrails project
- billing_account = "" # REQUIRED EDIT. Billing Account in the format of ######-######-######
+ billing_account = "REPLACE_WITH_BILLING_ID" # REQUIRED EDIT. Billing Account in the format of ######-######-######
org_id_scan_list = [ # REQUIRED EDIT. Organization Id list for service account to have cloud asset viewer permission
]
org_client = false #Set to true if deploying remote client landing zone. Otherwise set to false if deploying for core organization landing zone.
diff --git a/environments/nonprod/nonp-network.auto.tfvars b/environments/nonprod/nonp-network.auto.tfvars
index ec4da8d..e36ada8 100644
--- a/environments/nonprod/nonp-network.auto.tfvars
+++ b/environments/nonprod/nonp-network.auto.tfvars
@@ -7,7 +7,7 @@
nonprod_host_net = {
user_defined_string = "" # Must be globally unique. Used to create project name
additional_user_defined_string = ""
- billing_account = "######-######-######"
+ billing_account = "REPLACE_WITH_BILLING_ID" #"######-######-######"
services = ["logging.googleapis.com" , "dns.googleapis.com"]
networks = [
{
diff --git a/environments/prod/perimeter-network.auto.tfvars b/environments/prod/perimeter-network.auto.tfvars
index c8a26a9..f4beffb 100644
--- a/environments/prod/perimeter-network.auto.tfvars
+++ b/environments/prod/perimeter-network.auto.tfvars
@@ -6,8 +6,8 @@
public_perimeter_net = {
user_defined_string = "prod" # must be globally unique
- additional_user_defined_string = "perimeter"
- billing_account = "" #####-#####-#####
+ additional_user_defined_string = "perim" # check 61 char aggregate limit
+ billing_account = "REPLACE_WITH_BILLING_ID" #####-#####-#####
services = ["logging.googleapis.com"]
labels = {}
networks = [
@@ -42,8 +42,8 @@ public_perimeter_net = {
}
private_perimeter_net = {
user_defined_string = "prod" # must be globally unique
- additional_user_defined_string = "perimeter"
- billing_account = "" #####-#####-#####
+ additional_user_defined_string = "perim" # check 61 char aggregate limit
+ billing_account = "REPLACE_WITH_BILLING_ID" #####-#####-#####
services = ["logging.googleapis.com"]
networks = [
{
@@ -77,8 +77,8 @@ private_perimeter_net = {
ha_perimeter_net = {
user_defined_string = "prod" # must be globally unique
- additional_user_defined_string = "perimeter"
- billing_account = "" #####-#####-#####
+ additional_user_defined_string = "perim" # check 61 char agreggate limit
+ billing_account = "REPLACE_WITH_BILLING_ID" #####-#####-#####
services = ["logging.googleapis.com"]
networks = [
{
@@ -113,8 +113,8 @@ ha_perimeter_net = {
management_perimeter_net = {
user_defined_string = "prod" # must be globally unique
- additional_user_defined_string = "perimeter"
- billing_account = "" #####-#####-#####
+ additional_user_defined_string = "perim" # check 61 char aggregate limit
+ billing_account = "REPLACE_WITH_BILLING_ID" #####-#####-#####
services = ["logging.googleapis.com"]
networks = [
{
diff --git a/environments/prod/prod-network.auto.tfvars b/environments/prod/prod-network.auto.tfvars
index e40b1b6..ac274be 100644
--- a/environments/prod/prod-network.auto.tfvars
+++ b/environments/prod/prod-network.auto.tfvars
@@ -7,7 +7,7 @@
prod_host_net = {
user_defined_string = "" # Must be globally unique. Used to create project name
additional_user_defined_string = ""
- billing_account = "######-######-######"
+ billing_account = "REPLACE_WITH_BILLING_ID" ######-######-######"
services = ["logging.googleapis.com"]
networks = [
{
obriensystems
In leu of terragrunt or helm like templating - add a script to write/unwrite all the IDs specific to the customer
fill replaces....
unfill resets - in prep of commit obfuscation
targets