From: Sébastien Han <sebastien.han@enovance.com>
Date: Mon, 27 Apr 2015 17:05:31 +0000 (+0200)
Subject: Merge branch 'rolling-update' of https://github.com/leseb/ceph-ansible-1 into leseb... 
X-Git-Tag: v1.0.0~220^2~3^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=6053cb98fd9236eb7f6dbdf1a8f5d70f7621535d;p=ceph-ansible.git

Merge branch 'rolling-update' of https://github.com/leseb/ceph-ansible-1 into leseb-rolling-update

Signed-off-by: Sébastien Han <sebastien.han@enovance.com>

Conflicts:
	rolling_update.yml
---

6053cb98fd9236eb7f6dbdf1a8f5d70f7621535d
diff --cc rolling_update.yml
index 0022bde03,1e08c3bc1..16a7c8617
--- a/rolling_update.yml
+++ b/rolling_update.yml
@@@ -76,9 -67,14 +76,13 @@@
    sudo: True
  
    pre_tasks:
 -    - name: Set OSD flags
 +    - name: Set the noout flag
-       command: ceph osd set noout
+       command: ceph osd set {{ item }}
+       with_items:
+         - noout
+         - noscrub
+         - nodeep-scrub
 -      delegate_to: "{{ item }}"
 -      with_items: groups.mons[0]
 +      delegate_to: "{{ groups.mons[0] }}"
  
    roles:
      - ceph-common
@@@ -115,11 -111,16 +119,15 @@@
        until: result.rc == 0
        retries: 10
        delay: 10
 -      delegate_to: 127.0.0.1
 +      delegate_to: "{{ groups.mons[0] }}"
  
 -    - name: Unset OSD flags
 +    - name: Unset the noout flag
-       command: ceph osd unset noout
+       command: ceph osd unset {{ item }}
+       with_items:
+         - noout
+         - noscrub
+         - nodeep-scrub
 -      delegate_to: "{{ item }}"
 -      with_items: groups.mons[0]
 +      delegate_to: "{{ groups.mons[0] }}"
  
  
  - hosts: mdss