From 787a6e879e59fc0e93593ff6e4f3a398455ab7f7 Mon Sep 17 00:00:00 2001
From: Guillaume Abrioux <gabrioux@redhat.com>
Date: Tue, 13 Aug 2019 11:13:30 +0200
Subject: [PATCH] update: use ids to restart osds instead of device name

we must use the ids instead of device names in the tasks executed in
`post_tasks` for the osd rolling update otherwise it ends up with old
systemd units enabled.

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

Signed-off-by: Guillaume Abrioux <gabrioux@redhat.com>
---
 infrastructure-playbooks/rolling_update.yml | 32 +++------------------
 1 file changed, 4 insertions(+), 28 deletions(-)

diff --git a/infrastructure-playbooks/rolling_update.yml b/infrastructure-playbooks/rolling_update.yml
index 2a32b5215..c6cf3b92a 100644
--- a/infrastructure-playbooks/rolling_update.yml
+++ b/infrastructure-playbooks/rolling_update.yml
@@ -340,17 +340,10 @@
   become: True
 
   pre_tasks:
-    - name: get osd numbers - non container
+    - name: get osd numbers
       shell: "if [ -d /var/lib/ceph/osd ] ; then ls /var/lib/ceph/osd | sed 's/.*-//' ; fi"
       register: osd_ids
       changed_when: false
-      when: not containerized_deployment
-
-    - name: get osd unit names - container
-      shell: systemctl list-units | grep -E "loaded * active" | grep -oE "ceph-osd@([a-z0-9]+).service"
-      register: osd_names
-      changed_when: false
-      when: containerized_deployment
 
     - name: stop ceph osd
       systemd:
@@ -371,30 +364,13 @@
     - ceph-osd
 
   post_tasks:
-    - name: get osd numbers
-      shell: "if [ -d /var/lib/ceph/osd ] ; then ls /var/lib/ceph/osd | sed 's/.*-//' ; fi"
-      register: osd_ids
-      changed_when: false
-      when: not containerized_deployment
-
-    - name: start ceph osd
+    - name: restart ceph osd
       systemd:
-        name: ceph-osd@{{ item }}
-        state: started
-        enabled: yes
-      with_items: "{{ osd_ids.stdout_lines }}"
-      when:
-        - not containerized_deployment
-
-    - name: restart containerized ceph osd
-      systemd:
-        name: "{{ item }}"
+        name: "ceph-osd@{{ item }}"
         state: restarted
         enabled: yes
         daemon_reload: yes
-      with_items: "{{ osd_names.stdout_lines }}"
-      when:
-        - containerized_deployment
+      with_items: "{{ osd_ids.stdout_lines }}"
 
     - name: set_fact docker_exec_cmd_osd
       set_fact: