From a1a191c8b1714d09c33e74e944f07432489aa454 Mon Sep 17 00:00:00 2001 From: Daniel Chaffelson Date: Sun, 11 Sep 2022 16:15:22 +0100 Subject: [PATCH 1/2] Remove Infra availability checks during teardown as Infra may not actually be reachable Signed-off-by: Daniel Chaffelson --- pvc_base_teardown.yml | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/pvc_base_teardown.yml b/pvc_base_teardown.yml index e79826c..7e997eb 100644 --- a/pvc_base_teardown.yml +++ b/pvc_base_teardown.yml @@ -31,19 +31,6 @@ tasks_from: prep_pvc.yml tags: - always - -- name: Init run tasks for all nodes - hosts: all - gather_facts: no - tasks: - - name: Group hosts by host template and TLS - ansible.builtin.include_role: - name: cloudera.cluster.deployment.groupby - - - name: Check connectivity to Inventory - ansible.builtin.wait_for_connection: - tags: - - always # ENDBLOCK # Init run # STARTBLOCK # Teardown From 0ae38e2a02d86dbc8a819065cda6d660e0a86f8a Mon Sep 17 00:00:00 2001 From: Daniel Chaffelson Date: Thu, 22 Sep 2022 15:29:49 +0100 Subject: [PATCH 2/2] Added 'pvc' tag to cluster deployment for the scenario where ECS is being added to an existing CDP Base cluster Removed duplicate call to deploy local OS user accounts for ECS Signed-off-by: Daniel Chaffelson --- pvc_base_prereqs_ext.yml | 6 ------ pvc_base_setup.yml | 1 + 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/pvc_base_prereqs_ext.yml b/pvc_base_prereqs_ext.yml index b41284a..7e864dc 100644 --- a/pvc_base_prereqs_ext.yml +++ b/pvc_base_prereqs_ext.yml @@ -122,10 +122,6 @@ ansible.builtin.include_role: name: cloudera.cluster.prereqs.pvc_ecs - - name: Create user accounts for ECS nodes - ansible.builtin.include_role: - name: cloudera.cluster.prereqs.user_accounts_ecs - - name: Create local user accounts hosts: cloudera_manager, cluster become: yes @@ -150,8 +146,6 @@ ansible.builtin.include_role: name: cloudera.cluster.prereqs.user_accounts_ecs -# TODO: add pvc tag to all ecs_nodes plays - - name: Install JDK hosts: cloudera_manager, cluster, tls, krb5_server, ecs_nodes become: yes diff --git a/pvc_base_setup.yml b/pvc_base_setup.yml index 6ad4463..bcd2567 100644 --- a/pvc_base_setup.yml +++ b/pvc_base_setup.yml @@ -58,6 +58,7 @@ - cloudera.cluster.deployment.cluster tags: - cluster + - pvc - default_cluster - full_cluster