From: Sébastien Han <seb@redhat.com>
Date: Thu, 7 Sep 2017 07:16:31 +0000 (+0200)
Subject: switch-from-non-containerized-to-containerized: fix devices
X-Git-Tag: v3.0.0rc7~8^2
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=e46440e19c818172b45e3321e2145d2ce52ccc3b;p=ceph-ansible.git

switch-from-non-containerized-to-containerized: fix devices

If devices is passed through an extra var this register won't work so
let's only register the var is devices is not defined.

Closes: https://bugzilla.redhat.com/show_bug.cgi?id=1489099
Signed-off-by: Sébastien Han <seb@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 3ba0ebf55..bac7da470 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
@@ -203,8 +203,18 @@
     - name: collect osd devices
       shell: |
         blkid | awk '/ceph data/ { sub ("1:", "", $1); print $1 }'
-      register: devices
+      register: collect_devices
       changed_when: false
+      when:
+        - devices is not defined or (devices is defined and devices == [])
+
+    - name: set devices
+      set_fact:
+        devices: "{{ collect_devices.stdout_lines | list }}"
+      when:
+        - collect_devices is defined
+        - not collect_devices.get("skipped")
+        - collect_devices != []
 
     - name: stop non-containerized ceph osd(s)
       systemd:
@@ -249,7 +259,7 @@
         docker ps | grep -sq {{ item | regex_replace('/', '') }}
       changed_when: false
       failed_when: false
-      with_items: "{{ devices.stdout_lines }}"
+      with_items: "{{ devices }}"
       register: osd_running
 
     - name: unmount all the osd directories
@@ -257,13 +267,11 @@
       changed_when: false
       failed_when: false
       with_together:
-        - "{{ devices.stdout_lines }}"
+        - "{{ devices }}"
         - "{{ osd_running.results }}"
       when:
         - item.1.get("rc", 0) != 0
 
-    - set_fact: devices={{ devices.stdout_lines }}
-
   roles:
     - ceph-defaults
     - ceph-docker-common