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 <gabrioux@redhat.com>
pull/6641/head
Guillaume Abrioux 2021-06-28 20:16:03 +02:00
parent 31311b03ed
commit 26a7256c4c
1 changed files with 7 additions and 8 deletions

View File

@ -74,14 +74,6 @@
manager each time the playbook runs." manager each time the playbook runs."
when: mgr_to_kill is not defined 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 - name: exit playbook, if user did not mean to shrink cluster
fail: fail:
msg: "Exiting shrink-mgr playbook, no manager was removed. msg: "Exiting shrink-mgr playbook, no manager was removed.
@ -94,6 +86,13 @@
set_fact: set_fact:
mgr_to_kill_hostname: "{{ hostvars[mgr_to_kill]['ansible_facts']['hostname'] }}" 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: tasks:
- name: stop manager services and verify it - name: stop manager services and verify it
block: block: