From: Guillaume Abrioux <gabrioux@redhat.com>
Date: Wed, 19 Aug 2020 12:33:11 +0000 (+0200)
Subject: osd: move systemd rendering task
X-Git-Tag: v3.2.49
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=c373bfa00c3a32892a7977ddf6aaf954e0344822;p=ceph-ansible.git

osd: move systemd rendering task

This commit moves the systemd rendering task into `systemd.yml` file.
Otherwise, when running docker to podman playbook, the systemd unit file
isn't updated as it should be.

Closes: https://bugzilla.redhat.com/show_bug.cgi?id=1870141

Signed-off-by: Guillaume Abrioux <gabrioux@redhat.com>
---

diff --git a/roles/ceph-osd/tasks/start_osds.yml b/roles/ceph-osd/tasks/start_osds.yml
index a86308e21..217f8028c 100644
--- a/roles/ceph-osd/tasks/start_osds.yml
+++ b/roles/ceph-osd/tasks/start_osds.yml
@@ -83,19 +83,6 @@
   register: ceph_volume_osd_ids
   when: osd_scenario == 'lvm'
 
-- name: generate systemd unit file
-  become: true
-  template:
-    src: "{{ role_path }}/templates/ceph-osd.service.j2"
-    dest: /etc/systemd/system/ceph-osd@.service
-    owner: "root"
-    group: "root"
-    mode: "0644"
-  notify:
-    - restart ceph osds
-  when:
-    - containerized_deployment
-
 - name: device to id migration
   when:
     - containerized_deployment | bool
diff --git a/roles/ceph-osd/tasks/systemd.yml b/roles/ceph-osd/tasks/systemd.yml
index 0b93298b4..8c102bb55 100644
--- a/roles/ceph-osd/tasks/systemd.yml
+++ b/roles/ceph-osd/tasks/systemd.yml
@@ -8,4 +8,15 @@
     group: "root"
     mode: "0744"
   notify:
-    - restart ceph osds
\ No newline at end of file
+    - restart ceph osds
+
+- name: generate systemd unit file
+  become: true
+  template:
+    src: "{{ role_path }}/templates/ceph-osd.service.j2"
+    dest: /etc/systemd/system/ceph-osd@.service
+    owner: "root"
+    group: "root"
+    mode: "0644"
+  notify:
+    - restart ceph osds