From: Sébastien Han <seb@redhat.com>
Date: Mon, 3 Dec 2018 21:59:17 +0000 (+0100)
Subject: purge-cluster: add support for mon/mgr collocation
X-Git-Tag: v4.0.0beta1~110
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=fc6ebd8ebb39c74544ece57c401783908ad1ed24;p=ceph-ansible.git

purge-cluster: add support for mon/mgr collocation

Recently we introduced the default collocation of mon/mgr without the
need of a dedicated mgrs section. This means we have to stop the mgr
process on that machine too.

Signed-off-by: Sébastien Han <seb@redhat.com>
---

diff --git a/infrastructure-playbooks/purge-cluster.yml b/infrastructure-playbooks/purge-cluster.yml
index 510acb178..346a22e80 100644
--- a/infrastructure-playbooks/purge-cluster.yml
+++ b/infrastructure-playbooks/purge-cluster.yml
@@ -412,10 +412,13 @@
 
   - name: stop ceph mons with systemd
     service:
-      name: ceph-mon@{{ ansible_hostname }}
+      name: "ceph-{{ item }}@{{ ansible_hostname }}"
       state: stopped
       enabled: no
     failed_when: false
+    with_items:
+      - mon
+      - mgr
 
 
   - name: remove monitor store and bootstrap keys