rolling_update: fix wrong indent

Fixing: https://bugzilla.redhat.com/show_bug.cgi?id=1388295
Also add some notes in the README on how to run infrastructure
playbooks.

Signed-off-by: Sébastien Han <seb@redhat.com>
(cherry picked from commit b0989c700f9a4651b2cae978653d255ef0e0b4d9)

Conflicts:
	.gitignore
	infrastructure-playbooks/README.md
	infrastructure-playbooks/purge-docker-cluster.yml
	infrastructure-playbooks/switch-from-non-containerized-to-containerized-ceph-daemons.yml
	purge-cluster.yml

Resolves: rhbz#1388295

diff --git a/purge-cluster.yml b/purge-cluster.yml
index ee68d5c717bb197894270ddba88348f6b5de6f77..cb9d8d55fd07677372769ce84e03b79f61c115d6 100644 (file)
--- a/purge-cluster.yml
+++ b/purge-cluster.yml
@@ -109,8 +109,6 @@
     shell: "if [ -d /usr/lib/systemd ] ; then find /usr/lib/systemd/system -name 'ceph*' | wc -l ; else echo 0 ; fi"
     register: systemd_unit_files
 
-# after Hammer release
-
   - name: stop ceph.target with systemd
     service:
       name: ceph.target

diff --git a/rolling_update.yml b/rolling_update.yml
index da530d38af6f4c8d0c3c12cec75793247df1df35..b36349fa4c6bc586406c19deb4387159b2e27ae4 100644 (file)
--- a/rolling_update.yml
+++ b/rolling_update.yml
@@ -77,14 +77,14 @@
     - ceph-mon
 
   post_tasks:
-    - include_vars: ../roles/ceph-common/defaults/main.yml
-    - include_vars: ../roles/ceph-mon/defaults/main.yml
-    - include_vars: ../roles/ceph-restapi/defaults/main.yml
-    - include_vars: ../group_vars/all
+    - include_vars: roles/ceph-common/defaults/main.yml
+    - include_vars: roles/ceph-mon/defaults/main.yml
+    - include_vars: roles/ceph-restapi/defaults/main.yml
+    - include_vars: group_vars/all
       failed_when: false
-    - include_vars: ../group_vars/mons
+    - include_vars: group_vars/mons
       failed_when: false
-    - include_vars: ../group_vars/restapis
+    - include_vars: group_vars/restapis
       failed_when: false
 
     - name: restart ceph mons with upstart
@@ -136,11 +136,11 @@
   become: True
 
   pre_tasks:
-    - include_vars: ../roles/ceph-common/defaults/main.yml
-    - include_vars: ../roles/ceph-osd/defaults/main.yml
-    - include_vars: ../group_vars/all
+    - include_vars: roles/ceph-common/defaults/main.yml
+    - include_vars: roles/ceph-osd/defaults/main.yml
+    - include_vars: group_vars/all
       failed_when: false
-    - include_vars: ../group_vars/osds
+    - include_vars: group_vars/osds
       failed_when: false
 
     - name: set osd flags
@@ -156,11 +156,11 @@
     - ceph-osd
 
   post_tasks:
-    - include_vars: ../roles/ceph-common/defaults/main.yml
-    - include_vars: ../roles/ceph-osd/defaults/main.yml
-    - include_vars: ../group_vars/all
+    - include_vars: roles/ceph-common/defaults/main.yml
+    - include_vars: roles/ceph-osd/defaults/main.yml
+    - include_vars: group_vars/all
       failed_when: false
-    - include_vars: ../group_vars/osds
+    - include_vars: group_vars/osds
       failed_when: false
 
     - name: get osd numbers
@@ -222,11 +222,11 @@
     - ceph-mds
 
   post_tasks:
-    - include_vars: ../roles/ceph-common/defaults/main.yml
-    - include_vars: ../roles/ceph-mds/defaults/main.yml
-    - include_vars: ../group_vars/all
+    - include_vars: roles/ceph-common/defaults/main.yml
+    - include_vars: roles/ceph-mds/defaults/main.yml
+    - include_vars: group_vars/all
       failed_when: false
-    - include_vars: ../group_vars/mdss
+    - include_vars: group_vars/mdss
       failed_when: false
 
     - name: restart ceph mdss with upstart
@@ -267,11 +267,11 @@
     - ceph-rgw
 
   post_tasks:
-    - include_vars: ../roles/ceph-common/defaults/main.yml
-    - include_vars: ../roles/ceph-rgw/defaults/main.yml
-    - include_vars: ../group_vars/all
+    - include_vars: roles/ceph-common/defaults/main.yml
+    - include_vars: roles/ceph-rgw/defaults/main.yml
+    - include_vars: group_vars/all
       failed_when: false
-    - include_vars: ../group_vars/rgws
+    - include_vars: group_vars/rgws
       failed_when: false
 
     - name: restart ceph rgws with systemd