Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update GCP for L2 networking deployment #115

Merged
merged 3 commits into from
Aug 15, 2022
Merged
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 @@ -149,6 +149,7 @@ common__datalake_name: "{{ env.datalake.name | default([commo
common__datalake_name_suffix: "{{ env.datalake.suffix | default(common__datalake_suffix) }}"
common__tunnel: "{{ env.tunnel | default(False) }}"
common__public_endpoint_access: "{{ env.public_endpoint_access | default(not common__tunnel) }}"
common__use_public_ip: "{{ env.public_endpoint_access | default(not common__tunnel) }}"

common__env_admin_password: "{{ globals.admin_password | mandatory }}"
common__aws_policy_urls_default_root: "https://raw.githubusercontent.com/hortonworks/cloudbreak/master/cloud-aws-common/src/main/resources/definitions/cdp"
Expand Down
7 changes: 7 additions & 0 deletions roles/infrastructure/defaults/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -134,6 +134,13 @@ infra__gcp_project: "{{ common__gcp_project }}"
infra__gcp_storage_location_data: "{{ infra.gcp.storage.path.data | default([infra__storage_name, infra__data_path] | join('-')) }}"
infra__gcp_storage_location_logs: "{{ infra.gcp.storage.path.logs | default([infra__storage_name, infra__logs_path] | join('-')) }}"

infra__gcp_cloud_router_name_suffix: "{{ infra.gcp.network.router.name_suffix | default('router') }}"
infra__gcp_cloud_router_name: "{{ infra.gcp.network.router.name | default([infra__namespace, infra__gcp_cloud_router_name_suffix] | join('-')) }}"
infra__gcp_cloud_router_asn: "{{ infra.gcp.network.router.asn | default(64514) }}"

infra__gcp_cloud_nat_name_suffix: "{{ infra.gcp.network.nat.name_suffix | default('nat') }}"
infra__gcp_cloud_nat_name: "{{ infra.gcp.network.nat.name | default([infra__namespace, infra__gcp_cloud_nat_name_suffix] | join('-')) }}"

# Azure
infra__azure_metagroup_name: "{{ common__azure_metagroup_name }}"

Expand Down
41 changes: 40 additions & 1 deletion roles/infrastructure/tasks/setup_gcp_network.yml
Original file line number Diff line number Diff line change
Expand Up @@ -73,4 +73,43 @@
--project={{ infra__gcp_project }}
--network={{ infra__vpc_name }}
--service=servicenetworking.googleapis.com
--ranges={{ infra__vpc_svcnet_name }}
--ranges={{ infra__vpc_svcnet_name }}

# Cloud Router and Cloud NAT for L2 networking
- name: Create a Cloud Router
when:
- infra__tunnel
- not infra__public_endpoint_access
google.cloud.gcp_compute_router:
name: "{{ infra__gcp_cloud_router_name }}"
network: "{{ __gcp_vpc_info }}"
bgp:
asn: "{{ infra__gcp_cloud_router_asn }}"
advertise_mode: DEFAULT
region: "{{ infra__region }}"
project: "{{ infra__gcp_project }}"
state: present

- name: Discover Cloud NAT and Create if required
when:
- infra__tunnel
- not infra__public_endpoint_access
block:
- name: Discover Cloud NAT
ansible.builtin.command: >
gcloud compute routers nats describe {{ infra__gcp_cloud_nat_name }}
--router={{ infra__gcp_cloud_router_name }}
--router-region={{ infra__region }}
ignore_errors: true
register: __gcp_nat_discovered

- name: Create Cloud NAT if not discovered
when:
- __gcp_nat_discovered is failed
ansible.builtin.command: >
gcloud compute routers nats create {{ infra__gcp_cloud_nat_name }}
--router={{ infra__gcp_cloud_router_name }}
--router-region={{ infra__region }}
--auto-allocate-nat-external-ips
--nat-all-subnet-ip-ranges
--enable-logging
26 changes: 26 additions & 0 deletions roles/infrastructure/tasks/teardown_gcp_network.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,32 @@
name: "{{ infra__security_group_default_name }}"
state: absent

- name: Discover Cloud NAT and Delete if required
block:
- name: Delete Cloud NAT
ansible.builtin.command: >
gcloud compute routers nats describe {{ infra__gcp_cloud_nat_name }}
--router={{ infra__gcp_cloud_router_name }}
--router-region={{ infra__region }}
ignore_errors: true
register: __gcp_nat_discovered

- name: Delete Cloud NAT if discovered
when:
- __gcp_nat_discovered is succeeded
ansible.builtin.command: >
gcloud compute routers nats delete {{ infra__gcp_cloud_nat_name }}
--router={{ infra__gcp_cloud_router_name }}
--router-region={{ infra__region }}

- name: Delete a Cloud Router
google.cloud.gcp_compute_router:
name: "{{ infra__gcp_cloud_router_name }}"
network: "{{ __gcp_vpc_info }}"
region: "{{ infra__region }}"
project: "{{ infra__gcp_project }}"
state: absent

- name: Remove GCP VPC Subnets
google.cloud.gcp_compute_subnetwork:
region: "{{ infra__region }}"
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 @@ -78,6 +78,7 @@ plat__workload_analytics: "{{ env.workload_analytics | defau
plat__tunnel: "{{ common__tunnel }}"
plat__public_endpoint_access: "{{ common__public_endpoint_access }}"
plat__enable_raz: "{{ env.datalake.enable_raz | default(False) }}"
plat__use_public_ip: "{{ common__use_public_ip }}"

plat__env_admin_password: "{{ common__env_admin_password }}"

Expand Down
2 changes: 1 addition & 1 deletion roles/platform/tasks/setup_gcp_env.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
cloud: "{{ plat__infra_type }}"
region: "{{ plat__region }}"
public_key_text: "{{ plat__public_key_text }}"
public_ip: yes
public_ip: "{{ plat__use_public_ip }}"
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 }}"
Expand Down