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

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

diff --cc rolling_update.yml
index 0022bde0354c40364d109b449643c81a4e5e3925,1e08c3bc1caa178ea90ed099a7bfca931a37d531..16a7c8617b9ae9e3998afb8d439f44dceb173fd1
--- 1/rolling_update.yml
--- 2/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