Merge pull request #1051 from ceph/syntax-fixes

infrastructure-playbooks: fix syntax errors in all playbooks

infrastructure-playbooks/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/

infrastructure-playbooks/purge-multisite.yml

@@ -3,9 +3,9 @@
 - hosts: rgws
   become: True
   tasks:
-  - include: ~/ceph-ansible-master/roles/ceph-rgw/tasks/multisite/destroy.yml
+  - include: roles/ceph-rgw/tasks/multisite/destroy.yml
 
   handlers:
-  - include: ~/ceph-ansible-master/roles/ceph-rgw/handlers/main.yml
+  - include: roles/ceph-rgw/handlers/main.yml
     # Ansible 2.1.0 bug will ignore included handlers without this
     static: True

infrastructure-playbooks/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
+- 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 }}"
+  hosts:
+    - "{{ mon_group_name }}"
+    - "{{ osd_group_name }}"
+    - "{{ mds_group_name }}"
+    - "{{ rgw_group_name }}"
 
   become: True
   tasks: