From: Dimitri Savineau <dsavinea@redhat.com>
Date: Tue, 15 Sep 2020 13:46:30 +0000 (-0400)
Subject: switch2container: remove deb systemd units
X-Git-Tag: v6.0.0alpha2~32
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=c1af69a7e79a5909903490028f7ae13e519c98e0;p=ceph-ansible.git

switch2container: remove deb systemd units

When running the switch2container playbook on a Debian based system
then the systemd unit path isn't the same than Red Hat based system.
Because the systemd unit files aren't removed then the new container
systemd unit isn't take in count.

Signed-off-by: Dimitri Savineau <dsavinea@redhat.com>
---

diff --git a/infrastructure-playbooks/switch-from-non-containerized-to-containerized-ceph-daemons.yml b/infrastructure-playbooks/switch-from-non-containerized-to-containerized-ceph-daemons.yml
index 9c7aac6e4..0808751db 100644
--- a/infrastructure-playbooks/switch-from-non-containerized-to-containerized-ceph-daemons.yml
+++ b/infrastructure-playbooks/switch-from-non-containerized-to-containerized-ceph-daemons.yml
@@ -80,11 +80,13 @@
 
     - name: remove old systemd unit files
       file:
-        path: /usr/lib/systemd/system/{{ item }}
+        path: "{{ item }}"
         state: absent
       with_items:
-        - ceph-mon@.service
-        - ceph-mon.target
+        - /usr/lib/systemd/system/ceph-mon@.service
+        - /usr/lib/systemd/system/ceph-mon.target
+        - /lib/systemd/system/ceph-mon@.service
+        - /lib/systemd/system/ceph-mon.target
 
     - import_role:
         name: ceph-defaults
@@ -163,11 +165,13 @@
 
     - name: remove old systemd unit files
       file:
-        path: /usr/lib/systemd/system/{{ item }}
+        path: "{{ item }}"
         state: absent
       with_items:
-        - ceph-mgr@.service
-        - ceph-mgr.target
+        - /usr/lib/systemd/system/ceph-mgr@.service
+        - /usr/lib/systemd/system/ceph-mgr.target
+        - /lib/systemd/system/ceph-mgr@.service
+        - /lib/systemd/system/ceph-mgr.target
 
     - import_role:
         name: ceph-defaults
@@ -252,6 +256,9 @@
         - /usr/lib/systemd/system/ceph-osd.target
         - /usr/lib/systemd/system/ceph-osd@.service
         - /usr/lib/systemd/system/ceph-volume@.service
+        - /lib/systemd/system/ceph-osd.target
+        - /lib/systemd/system/ceph-osd@.service
+        - /lib/systemd/system/ceph-volume@.service
 
     - import_role:
         name: ceph-facts
@@ -360,11 +367,13 @@
 
     - name: remove old systemd unit files
       file:
-        path: /usr/lib/systemd/system/{{ item }}
+        path: "{{ item }}"
         state: absent
       with_items:
-        - ceph-mds@.service
-        - ceph-mds.target
+        - /usr/lib/systemd/system/ceph-mds@.service
+        - /usr/lib/systemd/system/ceph-mds.target
+        - /lib/systemd/system/ceph-mds@.service
+        - /lib/systemd/system/ceph-mds.target
 
     - import_role:
         name: ceph-defaults
@@ -431,11 +440,13 @@
 
     - name: remove old systemd unit files
       file:
-        path: /usr/lib/systemd/system/{{ item }}
+        path: "{{ item }}"
         state: absent
       with_items:
-        - ceph-radosgw@.service
-        - ceph-radosgw.target
+        - /usr/lib/systemd/system/ceph-radosgw@.service
+        - /usr/lib/systemd/system/ceph-radosgw.target
+        - /lib/systemd/system/ceph-radosgw@.service
+        - /lib/systemd/system/ceph-radosgw.target
 
     - import_role:
         name: ceph-handler
@@ -469,11 +480,13 @@
 
     - name: remove old systemd unit files
       file:
-        path: /usr/lib/systemd/system/{{ item }}
+        path: "{{ item }}"
         state: absent
       with_items:
-        - ceph-rbd-mirror@.service
-        - ceph-rbd-mirror.target
+        - /usr/lib/systemd/system/ceph-rbd-mirror@.service
+        - /usr/lib/systemd/system/ceph-rbd-mirror.target
+        - /lib/systemd/system/ceph-rbd-mirror@.service
+        - /lib/systemd/system/ceph-rbd-mirror.target
 
     - import_role:
         name: ceph-defaults