From 2726f6edf21e4a71e0a90044dd7879c07ceaa04a Mon Sep 17 00:00:00 2001
From: Christian Berendt <berendt@betacloud-solutions.de>
Date: Thu, 26 May 2016 22:10:47 +0200
Subject: [PATCH] Do not use bare variables in the ceph role

This will resolve the following deprecation warning:

Using bare variables is deprecated. Update your playbooks so
that the environment value uses the full variable syntax. This
feature will be removed in a future release.

Partial-bug: #1586404
Change-Id: I9086d3f9e7904836e72e6df2fefaa084e5229f7e
---
 ansible/roles/ceph/tasks/bootstrap_osds.yml | 4 ++--
 ansible/roles/ceph/tasks/do_reconfigure.yml | 8 ++++----
 ansible/roles/ceph/tasks/start_osds.yml     | 4 ++--
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/ansible/roles/ceph/tasks/bootstrap_osds.yml b/ansible/roles/ceph/tasks/bootstrap_osds.yml
index b4970b88c3..f5067ae8b9 100644
--- 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
index 7d18527f0e..0406c3bf95 100644
--- 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
index be86c38cef..96080775ad 100644
--- 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