Merge "Avoid creating an empty volume"

ansible/roles/glance/handlers/main.yml

@@ -12,7 +12,7 @@
     common_options: "{{ docker_common_options }}"
     name: "{{ service.container_name }}"
     image: "{{ service.image }}"
-    volumes: "{{ service.volumes }}"
+    volumes: "{{ service.volumes|reject('equalto', '')|list }}"
   when:
     - action != "config"
     - inventory_hostname in glance_api_hosts
@@ -36,7 +36,7 @@
     common_options: "{{ docker_common_options }}"
     name: "{{ service.container_name }}"
     image: "{{ service.image }}"
-    volumes: "{{ service.volumes }}"
+    volumes: "{{ service.volumes|reject('equalto', '')|list }}"
   when:
     - action != "config"
     - inventory_hostname in groups[service.group]

ansible/roles/glance/tasks/bootstrap_service.yml

@@ -31,7 +31,7 @@
       BOOTSTRAP:
     name: "bootstrap_glance"
     restart_policy: "never"
-    volumes: "{{ glance_api.volumes }}"
+    volumes: "{{ glance_api.volumes|reject('equalto', '')|list }}"
   run_once: True
   delegate_to: "{{ groups[glance_api.group][0] }}"
 

ansible/roles/glance/tasks/config.yml

@@ -117,7 +117,7 @@
     common_options: "{{ docker_common_options }}"
     name: "{{ item.value.container_name }}"
     image: "{{ item.value.image }}"
-    volumes: "{{ item.value.volumes }}"
+    volumes: "{{ item.value.volumes|reject('equalto', '')|list }}"
   register: check_glance_containers
   when:
     - action != "config"