Skip to content

Commit c9f126a

Browse files
authored
Support the use of other CDP control planes (#91)
* Add CDP control plane regions details to common * Update platform role to work across CDP Control Plane regions Signed-off-by: Jim Enright <[email protected]>
1 parent 8ec3421 commit c9f126a

File tree

5 files changed

+15
-6
lines changed

5 files changed

+15
-6
lines changed

roles/common/defaults/main.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,9 @@ common__ngw_suffix: "{{ globals.labels.nat_gateway | defau
5656

5757
common__unique_storage_name_suffix: "{{ globals.storage.name | default((common__region + common__aws_profile) if 'aws' in common__infra_type else common__region) }}"
5858

59+
# CDP Control Plane Region
60+
common__cdp_control_plane_region: "{{ globals.cdp_region | default('us-west-1') }}"
61+
common__cdp_control_plane_crn: "{{ common__cdp_control_planes[common__cdp_control_plane_region] }}"
5962
# Infra
6063
common__infra_deployment_engine: "{{ globals.infra_deployment_engine | default('ansible') }}"
6164
common__infra_type: "{{ globals.infra_type | default('aws') }}"

roles/common/vars/main.yml

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,4 +17,10 @@
1717
common__region_default:
1818
aws: "{{ common__aws_region }}"
1919
azure: "{{ common__azure_region }}"
20-
gcp: "{{ common__gcp_region }}"
20+
gcp: "{{ common__gcp_region }}"
21+
22+
common__cdp_control_planes:
23+
us-west-1: "crn:altus:iam:us-west-1:altus"
24+
eu-1: "crn:altus:iam:eu-1:altus"
25+
ap-1: "crn:altus:iam:ap-1:altus"
26+

roles/platform/defaults/main.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@ plat__env_suffix: "{{ common__env_suffix }}"
4040
plat__vpc_private_subnets_suffix: "{{ common__vpc_private_subnets_suffix }}"
4141
plat__vpc_public_subnets_suffix: "{{ common__vpc_public_subnets_suffix }}"
4242

43+
plat__cdp_control_plane_crn: "{{ common__cdp_control_plane_crn }}"
4344
plat__cdp_iam_role_suffix: "{{ plat__cdp_iam_identities.role_suffix }}"
4445
plat__cdp_iam_resource_suffix: "{{ plat__cdp_iam_identities.resource_role_suffix }}"
4546

roles/platform/tasks/initialize_setup_base.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@
5555
ansible.builtin.set_fact:
5656
plat__cdp_pub_admin_group_role_crns: "{{ plat__cdp_pub_admin_group_role_crns | default([]) | union([role]) }}"
5757
vars:
58-
role: "{{ [plat__cdp_iam_identities.namespace, plat__cdp_iam_role_suffix, __cdp_pub_admin_group_role_item] | join(':') }}"
58+
role: "{{ [plat__cdp_control_plane_crn, plat__cdp_iam_role_suffix, __cdp_pub_admin_group_role_item] | join(':') }}"
5959
loop_control:
6060
loop_var: __cdp_pub_admin_group_role_item
6161
loop: "{{ plat__cdp_iam_admin_group_roles }}"
@@ -64,7 +64,7 @@
6464
ansible.builtin.set_fact:
6565
plat__cdp_pub_admin_group_resource_role_crns: "{{ plat__cdp_pub_admin_group_resource_role_crns | default([]) | union([resource_role]) }}"
6666
vars:
67-
resource_role: "{{ [plat__cdp_iam_identities.namespace, plat__cdp_iam_resource_suffix, __cdp_env_admin_group_resource_role_item] | join(':') }}"
67+
resource_role: "{{ [plat__cdp_control_plane_crn, plat__cdp_iam_resource_suffix, __cdp_env_admin_group_resource_role_item] | join(':') }}"
6868
loop_control:
6969
loop_var: __cdp_env_admin_group_resource_role_item
7070
loop: "{{ plat__cdp_iam_admin_group_resource_roles }}"
@@ -73,7 +73,7 @@
7373
ansible.builtin.set_fact:
7474
plat__cdp_pub_user_group_role_crns: "{{ plat__cdp_pub_user_group_role_crns | default([]) | union([role]) }}"
7575
vars:
76-
role: "{{ [plat__cdp_iam_identities.namespace, plat__cdp_iam_role_suffix, __cdp_pub_user_group_role_item] | join(':') }}"
76+
role: "{{ [plat__cdp_control_plane_crn, plat__cdp_iam_role_suffix, __cdp_pub_user_group_role_item] | join(':') }}"
7777
loop_control:
7878
loop_var: __cdp_pub_user_group_role_item
7979
loop: "{{ plat__cdp_iam_user_group_roles }}"
@@ -82,7 +82,7 @@
8282
ansible.builtin.set_fact:
8383
plat__cdp_pub_user_group_resource_role_crns: "{{ plat__cdp_pub_user_group_resource_role_crns | default([]) | union([resource_role]) }}"
8484
vars:
85-
resource_role: "{{ [plat__cdp_iam_identities.namespace, plat__cdp_iam_resource_suffix, __cdp_pub_user_group_resource_role_item] | join(':') }}"
85+
resource_role: "{{ [plat__cdp_control_plane_crn, plat__cdp_iam_resource_suffix, __cdp_pub_user_group_resource_role_item] | join(':') }}"
8686
loop_control:
8787
loop_var: __cdp_pub_user_group_resource_role_item
8888
loop: "{{ plat__cdp_iam_user_group_resource_roles }}"

roles/platform/vars/main.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@ plat__gcp_roles:
3030
iam_service_account_token_creator: roles/iam.serviceAccountTokenCreator
3131

3232
plat__cdp_iam_identities:
33-
namespace: "crn:altus:iam:us-west-1:altus"
3433
role_suffix: role
3534
resource_role_suffix: resourceRole
3635
env_admin: EnvironmentAdmin

0 commit comments

Comments
 (0)