Merge "Do not use bare variables in the ceph role"

openstack · May 31, 2016 · 4ad1af1 · 4ad1af1
2 parents 533560e + 2726f6e
commit 4ad1af1
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 8 deletions.
diff --git a/ansible/roles/ceph/tasks/bootstrap_osds.yml b/ansible/roles/ceph/tasks/bootstrap_osds.yml
@@ -52,7 +52,7 @@
       - "/etc/localtime:/etc/localtime:ro"
       - "/dev/:/dev/"
       - "kolla_logs:/var/log/kolla/"
-  with_indexed_items: osds_bootstrap|default([])
+  with_indexed_items: "{{ osds_bootstrap|default([]) }}"
 
 - name: Bootstrapping Ceph Cache OSDs
   kolla_docker:
@@ -84,4 +84,4 @@
       - "/etc/localtime:/etc/localtime:ro"
       - "/dev/:/dev/"
       - "kolla_logs:/var/log/kolla/"
-  with_indexed_items: osds_cache_bootstrap|default([])
+  with_indexed_items: "{{ osds_cache_bootstrap|default([]) }}"
diff --git a/ansible/roles/ceph/tasks/do_reconfigure.yml b/ansible/roles/ceph/tasks/do_reconfigure.yml
@@ -25,7 +25,7 @@
 
 - name: Gathering OSD IDs
   command: "cat /var/lib/ceph/osd/{{ item['fs_uuid'] }}/whoami"
-  with_items: osds
+  with_items: "{{ osds }}"
   register: osd_ids
   changed_when: False
   failed_when: osd_ids.rc != 0
@@ -38,7 +38,7 @@
   register: ceph_osd_container_state
   failed_when: ceph_osd_container_state.Running == false
   when: inventory_hostname in groups['ceph-osd']
-  with_items: osd_ids.results
+  with_items: "{{ osd_ids.results }}"
 
 - name: Ensuring the ceph_rgw container is up
   kolla_docker:
@@ -68,7 +68,7 @@
   changed_when: false
   failed_when: false
   register: ceph_osd_check_results
-  with_items: osd_ids.results
+  with_items: "{{ osd_ids.results }}"
   when: inventory_hostname in groups['ceph-osd']
 
 - name: Check the configs in ceph_rgw container
@@ -96,7 +96,7 @@
     name: "ceph_osd_{{ item.stdout }}"
     action: "get_container_env"
   register: ceph_osd_container_envs
-  with_items: osd_ids.results
+  with_items: "{{ osd_ids.results }}"
   when:
     - inventory_hostname in groups['ceph-osd']
     - osds

diff --git a/ansible/roles/ceph/tasks/start_osds.yml b/ansible/roles/ceph/tasks/start_osds.yml
@@ -18,11 +18,11 @@
     state: mounted
     name: "/var/lib/ceph/osd/{{ item['fs_uuid'] }}"
     opts: "{{ ceph_osd_mount_options }}"
-  with_items: osds
+  with_items: "{{ osds }}"
 
 - name: Gathering OSD IDs
   command: "cat /var/lib/ceph/osd/{{ item['fs_uuid'] }}/whoami"
-  with_items: osds
+  with_items: "{{ osds }}"
   register: id
   changed_when: False
   failed_when: id.rc != 0