Skip to content

Support the use of other CDP control planes #91

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.

Sign up for GitHub

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

Merged
merged 2 commits into from
Mar 10, 2022
Merged

Support the use of other CDP control planes #91

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d4f3671
Add CDP control plane regions details to common
jimright Mar 4, 2022
62845ae
Update platform role to work across CDP Control Plane regions
jimright Mar 4, 2022
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
3 changes: 3 additions & 0 deletions roles/common/defaults/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,9 @@ common__ngw_suffix: "{{ globals.labels.nat_gateway | defau

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

# CDP Control Plane Region
common__cdp_control_plane_region: "{{ globals.cdp_region | default('us-west-1') }}"
common__cdp_control_plane_crn: "{{ common__cdp_control_planes[common__cdp_control_plane_region] }}"
# Infra
common__infra_deployment_engine: "{{ globals.infra_deployment_engine | default('ansible') }}"
common__infra_type: "{{ globals.infra_type | default('aws') }}"
Expand Down
8 changes: 7 additions & 1 deletion roles/common/vars/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,4 +17,10 @@
common__region_default:
aws: "{{ common__aws_region }}"
azure: "{{ common__azure_region }}"
gcp: "{{ common__gcp_region }}"
gcp: "{{ common__gcp_region }}"

common__cdp_control_planes:
us-west-1: "crn:altus:iam:us-west-1:altus"
eu-1: "crn:altus:iam:eu-1:altus"
ap-1: "crn:altus:iam:ap-1:altus"

1 change: 1 addition & 0 deletions roles/platform/defaults/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ plat__env_suffix: "{{ common__env_suffix }}"
plat__vpc_private_subnets_suffix: "{{ common__vpc_private_subnets_suffix }}"
plat__vpc_public_subnets_suffix: "{{ common__vpc_public_subnets_suffix }}"

plat__cdp_control_plane_crn: "{{ common__cdp_control_plane_crn }}"
plat__cdp_iam_role_suffix: "{{ plat__cdp_iam_identities.role_suffix }}"
plat__cdp_iam_resource_suffix: "{{ plat__cdp_iam_identities.resource_role_suffix }}"

Expand Down
8 changes: 4 additions & 4 deletions roles/platform/tasks/initialize_setup_base.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@
ansible.builtin.set_fact:
plat__cdp_pub_admin_group_role_crns: "{{ plat__cdp_pub_admin_group_role_crns | default([]) | union([role]) }}"
vars:
role: "{{ [plat__cdp_iam_identities.namespace, plat__cdp_iam_role_suffix, __cdp_pub_admin_group_role_item] | join(':') }}"
role: "{{ [plat__cdp_control_plane_crn, plat__cdp_iam_role_suffix, __cdp_pub_admin_group_role_item] | join(':') }}"
loop_control:
loop_var: __cdp_pub_admin_group_role_item
loop: "{{ plat__cdp_iam_admin_group_roles }}"
Expand All @@ -64,7 +64,7 @@
ansible.builtin.set_fact:
plat__cdp_pub_admin_group_resource_role_crns: "{{ plat__cdp_pub_admin_group_resource_role_crns | default([]) | union([resource_role]) }}"
vars:
resource_role: "{{ [plat__cdp_iam_identities.namespace, plat__cdp_iam_resource_suffix, __cdp_env_admin_group_resource_role_item] | join(':') }}"
resource_role: "{{ [plat__cdp_control_plane_crn, plat__cdp_iam_resource_suffix, __cdp_env_admin_group_resource_role_item] | join(':') }}"
loop_control:
loop_var: __cdp_env_admin_group_resource_role_item
loop: "{{ plat__cdp_iam_admin_group_resource_roles }}"
Expand All @@ -73,7 +73,7 @@
ansible.builtin.set_fact:
plat__cdp_pub_user_group_role_crns: "{{ plat__cdp_pub_user_group_role_crns | default([]) | union([role]) }}"
vars:
role: "{{ [plat__cdp_iam_identities.namespace, plat__cdp_iam_role_suffix, __cdp_pub_user_group_role_item] | join(':') }}"
role: "{{ [plat__cdp_control_plane_crn, plat__cdp_iam_role_suffix, __cdp_pub_user_group_role_item] | join(':') }}"
loop_control:
loop_var: __cdp_pub_user_group_role_item
loop: "{{ plat__cdp_iam_user_group_roles }}"
Expand All @@ -82,7 +82,7 @@
ansible.builtin.set_fact:
plat__cdp_pub_user_group_resource_role_crns: "{{ plat__cdp_pub_user_group_resource_role_crns | default([]) | union([resource_role]) }}"
vars:
resource_role: "{{ [plat__cdp_iam_identities.namespace, plat__cdp_iam_resource_suffix, __cdp_pub_user_group_resource_role_item] | join(':') }}"
resource_role: "{{ [plat__cdp_control_plane_crn, plat__cdp_iam_resource_suffix, __cdp_pub_user_group_resource_role_item] | join(':') }}"
loop_control:
loop_var: __cdp_pub_user_group_resource_role_item
loop: "{{ plat__cdp_iam_user_group_resource_roles }}"
Expand Down
1 change: 0 additions & 1 deletion roles/platform/vars/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@ plat__gcp_roles:
iam_service_account_token_creator: roles/iam.serviceAccountTokenCreator

plat__cdp_iam_identities:
namespace: "crn:altus:iam:us-west-1:altus"
role_suffix: role
resource_role_suffix: resourceRole
env_admin: EnvironmentAdmin
Expand Down