From: Rachana Patel <rachana83.patel@gmail.com>
Date: Tue, 6 Sep 2016 14:29:00 +0000 (-0400)
Subject: rolling_update.yml will not work if cluster name is not 'ceph'. Adding --cluster... 
X-Git-Tag: ceph-ansible-1.0.5-34
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=f9cb16f10bd402da985f52e2007a8ae2757d63f7;p=ceph-ansible.git

rolling_update.yml will not work if cluster name is not 'ceph'. Adding --cluster will solve this problem

 Fixes issue #969

Signed-off-by: Rachana Patel <rachana83.patel@gmail.com>

Resolves: rhbz#1373919
---

diff --git a/rolling_update.yml b/rolling_update.yml
index 2bdf0b442..6c112d060 100644
--- a/rolling_update.yml
+++ b/rolling_update.yml
@@ -92,7 +92,7 @@
 
     - name: waiting for the monitor to join the quorum...
       shell: |
-        ceph -s | grep monmap | sed 's/.*quorum//' | egrep -sq {{ ansible_hostname }}
+        ceph -s  --cluster {{ cluster }} | grep monmap | sed 's/.*quorum//' | egrep -sq {{ ansible_hostname }}
       register: result
       until: result.rc == 0
       retries: 5
@@ -109,7 +109,7 @@
 
   pre_tasks:
     - name: set osd flags
-      command: ceph osd set {{ item }}
+      command: ceph osd set {{ item }} --cluster {{ cluster }}
       with_items:
         - noout
         - noscrub
@@ -148,7 +148,7 @@
 
     - name: waiting for clean pgs...
       shell: |
-        test "$(ceph pg stat | sed 's/^.*pgs://;s/active+clean.*//;s/ //')" -eq "$(ceph pg stat | sed 's/pgs.*//;s/^.*://;s/ //')" && ceph health | egrep -sq "HEALTH_OK|HEALTH_WARN"
+        test "$(ceph pg stat --cluster {{ cluster }} | sed 's/^.*pgs://;s/active+clean.*//;s/ //')" -eq "$(ceph pg stat --cluster {{ cluster }}  | sed 's/pgs.*//;s/^.*://;s/ //')" && ceph health --cluster {{ cluster }}  | egrep -sq "HEALTH_OK|HEALTH_WARN"
       register: result
       until: result.rc == 0
       retries: 10
@@ -156,7 +156,7 @@
       delegate_to: "{{ groups.mons[0] }}"
 
     - name: unset osd flags
-      command: ceph osd unset {{ item }}
+      command: ceph osd unset {{ item }} --cluster {{ cluster }}
       with_items:
         - noout
         - noscrub