From: Guillaume Abrioux <gabrioux@redhat.com>
Date: Mon, 10 Dec 2018 20:43:35 +0000 (+0100)
Subject: purge-docker: do not call ceph-osd role
X-Git-Tag: v3.2.2~4
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=0ff1260fc1bb21ef8bc1b710ed7d061220ed2ed1;p=ceph-ansible.git

purge-docker: do not call ceph-osd role

calling ceph-osd role in purge playbook is not needed.

Signed-off-by: Guillaume Abrioux <gabrioux@redhat.com>
(cherry picked from commit ae7f3d66a67d9e446bf66aed4f26dd5701afdbda)
---

diff --git a/infrastructure-playbooks/purge-docker-cluster.yml b/infrastructure-playbooks/purge-docker-cluster.yml
index 4a2f5d98c..1c479b007 100644
--- a/infrastructure-playbooks/purge-docker-cluster.yml
+++ b/infrastructure-playbooks/purge-docker-cluster.yml
@@ -321,10 +321,6 @@
       name: ceph-defaults
       private: false
 
-  - import_role:
-      name: ceph-osd
-      private: false
-
   - name: get all the running osds
     shell: |
       systemctl list-units | grep 'loaded[[:space:]]\+active' | grep -oE "ceph-osd@([0-9]{1,2}|[a-z]+).service"
@@ -548,7 +544,6 @@
       - "ceph-mon-{{ ansible_hostname }}"
       - "ceph-mgr-{{ ansible_hostname }}"
 
-<<<<<<< HEAD
   - name: remove restapi container
     docker_container:
       image: "{{ ceph_docker_registry }}/{{ ceph_docker_image }}:{{ ceph_docker_image_tag }}"
@@ -557,9 +552,6 @@
     ignore_errors: true
 
   - name: remove ceph mon service
-=======
-  - name: remove ceph mon and mgr service
->>>>>>> 325a1594... purge-docker-cluster: add support for mgr/mon collocation
     file:
       path: "/etc/systemd/system/ceph-{{ item }}@.service"
       state: absent