From: Andrew Schoen <aschoen@redhat.com>
Date: Tue, 25 Oct 2016 21:56:58 +0000 (-0500)
Subject: infrastructure-playbooks: fix syntax errors in all playbooks
X-Git-Tag: ceph-ansible-1.0.5-39~3
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=f8e4d5d12680fd3de316034991aeecbf7cac3abb;p=ceph-ansible.git

infrastructure-playbooks: fix syntax errors in all playbooks

Signed-off-by: Andrew Schoen <aschoen@redhat.com>
(cherry picked from commit bebf412c925962f9f1df40a239a10bed03256d8a)

Conflicts:
	infrastructure-playbooks/purge-multisite.yml

Resolves: rhbz#1388295
---

diff --git a/cluster-os-migration.yml b/cluster-os-migration.yml
index 9053dfd91..21e17d904 100644
--- a/cluster-os-migration.yml
+++ b/cluster-os-migration.yml
@@ -453,7 +453,7 @@
     - fail: msg="Looks like an archive is already there, please remove it!"
       when: migration_completed.stat.exists == False and rgw_archive_leftover.stat.exists == True
 
-   - name: Archive rados gateway configs
+    - name: Archive rados gateway configs
       shell: >
         tar -cpvzf - --one-file-system . /etc/ceph/* /etc/apache2/* | cat > {{ ansible_hostname }}.tar
         chdir=/var/lib/ceph/
@@ -523,7 +523,9 @@
       when: migration_completed.stat.exists == False
 
     - name: Copy keys and configs
-      shell: {{ item }} chdir=/var/lib/ceph/
+      shell: >
+        {{ item }}
+        chdir=/var/lib/ceph/
       with_items:
         - cp etc/ceph/* /etc/ceph/
         - cp -r etc/apache2/* /etc/httpd/
diff --git a/rolling_update.yml b/rolling_update.yml
index 9fd96835f..da530d38a 100644
--- a/rolling_update.yml
+++ b/rolling_update.yml
@@ -28,17 +28,18 @@
          invoking the playbook"
     when: ireallymeanit != 'yes'
 
-vars:
-  mon_group_name:       mons
-  osd_group_name:       osds
-  mds_group_name:       mdss
-  rgw_group_name:       rgws
-
-hosts:
-  - "{{ mon_group_name }}"
-  - "{{ osd_group_name }}"
-  - "{{ mds_group_name }}"
-  - "{{ rgw_group_name }}"
+- name: gather facts and check the init system
+  vars:
+    mon_group_name:       mons
+    osd_group_name:       osds
+    mds_group_name:       mdss
+    rgw_group_name:       rgws
+
+  hosts:
+    - "{{ mon_group_name }}"
+    - "{{ osd_group_name }}"
+    - "{{ mds_group_name }}"
+    - "{{ rgw_group_name }}"
 
   become: True
   tasks: