From e1671ff7dab2891c0112f14c81f44370a2217f7d Mon Sep 17 00:00:00 2001 From: Chris Perro Date: Tue, 10 Aug 2021 13:47:14 -0400 Subject: [PATCH] Update env setup to include passing freeipa instance count. Add some defaults for DL and FreeIPA scales Signed-off-by: Chris Perro --- roles/platform/defaults/main.yml | 4 +++- roles/platform/tasks/setup_aws_env.yml | 2 ++ roles/platform/tasks/setup_azure_env.yml | 4 +++- roles/platform/tasks/setup_gcp_env.yml | 2 ++ 4 files changed, 10 insertions(+), 2 deletions(-) diff --git a/roles/platform/defaults/main.yml b/roles/platform/defaults/main.yml index 55632986..bb7b6191 100644 --- a/roles/platform/defaults/main.yml +++ b/roles/platform/defaults/main.yml @@ -80,9 +80,11 @@ plat__cdp_iam_user_group_name: "{{ env.cdp.user_group.name | defa plat__cdp_iam_user_group_roles: "{{ env.cdp.user_group.roles | default([plat__cdp_iam_identities.env_user]) }}" plat__cdp_iam_user_group_resource_roles: "{{ env.cdp.user_group.resource_roles | default(plat__cdp_iam_user_group_resource_roles_default) }}" +plat__env_freeipa: "{{ env.freeipa.instance_count | default(env.enable_ha | default(false) | ternary(3, 2)) }}" + plat__datalake_name: "{{ common__datalake_name }}" plat__datalake_version: "{{ env.datalake.version | default(omit) }}" -plat__datalake_scale: "{{ env.datalake.scale | default(omit) }}" +plat__datalake_scale: "{{ env.datalake.scale | default(env.enable_ha | default(false) | ternary('MEDIUM_DUTY_HA', 'LIGHT_DUTY')) }}" plat__datalake_user_sync: "{{ env.datalake.user_sync | default(True) }}" plat__cdp_xaccount_external_id: "{{ env.cdp.cross_account.external_id | default(False) }}" diff --git a/roles/platform/tasks/setup_aws_env.yml b/roles/platform/tasks/setup_aws_env.yml index 859275d3..ceaf4ea5 100644 --- a/roles/platform/tasks/setup_aws_env.yml +++ b/roles/platform/tasks/setup_aws_env.yml @@ -33,3 +33,5 @@ tunnel: "{{ plat__tunnel }}" endpoint_access_scheme: "{{ plat__endpoint_access_scheme | default(omit) }}" endpoint_access_subnets: "{{ plat__aws_public_subnet_ids | default(omit) }}" + freeipa: + instanceCountByGroup: "{{ plat__env_freeipa }}" \ No newline at end of file diff --git a/roles/platform/tasks/setup_azure_env.yml b/roles/platform/tasks/setup_azure_env.yml index 020a779d..f8f07f97 100644 --- a/roles/platform/tasks/setup_azure_env.yml +++ b/roles/platform/tasks/setup_azure_env.yml @@ -32,4 +32,6 @@ resource_gp: "{{ plat__azure_metagroup_name }}" subnet_ids: "{{ plat__azure_subnets }}" public_ip: "{{ plat__public_endpoint_access }}" - tags: "{{ plat__tags }}" \ No newline at end of file + tags: "{{ plat__tags }}" + freeipa: + instanceCountByGroup: "{{ plat__env_freeipa }}" \ No newline at end of file diff --git a/roles/platform/tasks/setup_gcp_env.yml b/roles/platform/tasks/setup_gcp_env.yml index 840f533e..ee586766 100644 --- a/roles/platform/tasks/setup_gcp_env.yml +++ b/roles/platform/tasks/setup_gcp_env.yml @@ -32,3 +32,5 @@ tunnel: "{{ plat__tunnel }}" workload_analytics: "{{ plat__workload_analytics }}" tags: "{{ plat__tags }}" + freeipa: + instanceCountByGroup: "{{ plat__env_freeipa }}"