From 26a7256c4cec17fc9bc20a239c112cbf8584be09 Mon Sep 17 00:00:00 2001 From: Guillaume Abrioux Date: Mon, 28 Jun 2021 20:16:03 +0200 Subject: [PATCH] shrink-mgr: modify existing mgr check Do not rely on the inventory aliases in order to check if the selected manager to be removed is present. Closes: https://bugzilla.redhat.com/show_bug.cgi?id=1967897 Signed-off-by: Guillaume Abrioux --- infrastructure-playbooks/shrink-mgr.yml | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/infrastructure-playbooks/shrink-mgr.yml b/infrastructure-playbooks/shrink-mgr.yml index f99726890..66745f7c6 100644 --- a/infrastructure-playbooks/shrink-mgr.yml +++ b/infrastructure-playbooks/shrink-mgr.yml @@ -74,14 +74,6 @@ manager each time the playbook runs." when: mgr_to_kill is not defined - - name: exit playbook, if the manager is not part of the inventory - fail: - msg: "It seems that the host given is not part of your inventory, - please make sure it is." - when: - - mgr_to_kill not in active_mgr - - mgr_to_kill not in standbys_mgr - - name: exit playbook, if user did not mean to shrink cluster fail: msg: "Exiting shrink-mgr playbook, no manager was removed. @@ -94,6 +86,13 @@ set_fact: mgr_to_kill_hostname: "{{ hostvars[mgr_to_kill]['ansible_facts']['hostname'] }}" + - name: exit playbook, if the selected manager is not present in the cluster + fail: + msg: "It seems that the host given is not present in the cluster." + when: + - mgr_to_kill_hostname not in active_mgr + - mgr_to_kill_hostname not in standbys_mgr + tasks: - name: stop manager services and verify it block: -- 2.39.5