Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions roles/common/defaults/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,7 @@ common__terraform_remote_state_bucket: "{{ globals.terraform.remote_state_bu
common__terraform_remote_state_lock_table: "{{ globals.terraform.remote_state_lock_table | default('') }}"

common__vpc_name: "{{ infra.vpc.name | default([common__namespace, common__vpc_name_suffix] | join('-')) }}"
common__vpc_project: "{{ infra.vpc.project_id | default(omit) }}"
common__vpc_public_subnet_cidrs: "{{ infra.vpc.public_subnets | default(['10.10.0.0/19', '10.10.32.0/19', '10.10.64.0/19']) }}"
common__vpc_private_subnet_cidrs: "{{ infra.vpc.private_subnets | default(['10.10.96.0/19', '10.10.128.0/19', '10.10.160.0/19']) }}"
common__vpc_private_subnets_suffix: "{{ infra.vpc.public_subnets_suffix | default([common__vpc_subnet_suffix, common__private_suffix] | join('-')) }}"
Expand Down
1 change: 1 addition & 0 deletions roles/platform/defaults/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@ plat__cdp_iam_resource_suffix: "{{ plat__cdp_iam_identities.resou
plat__tags: "{{ common__tags }}"
plat__env_name: "{{ common__env_name }}"
plat__vpc_name: "{{ common__vpc_name }}"
plat__vpc_project: "{{ common__vpc_project }}"
plat__storage_name: "{{ common__storage_name }}"

plat__logs_path: "{{ common__logs_path }}"
Expand Down
1 change: 1 addition & 0 deletions roles/platform/tasks/setup_gcp_env.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
log_location: "gs://{{ plat__gcp_storage_location_logs }}"
log_identity: "{{ plat__gcp_log_identity_name }}@{{ plat__gcp_project }}.iam.gserviceaccount.com"
vpc_id: "{{ plat__vpc_name }}"
vpc_project_id: "{{ plat__vpc_project }}"
subnet_ids:
- "{{ plat__gcp_subnet_id if plat__gcp_subnet_id else plat__gcp_subnets_discovered[0].name }}" # TODO - Check in validation_gcp.yml -- CDP on GCP only supports a single subnet deployment
project: "{{ plat__gcp_project }}"
Expand Down