diff --git a/ansible/roles/glance/handlers/main.yml b/ansible/roles/glance/handlers/main.yml index c018ace502bdaac1fa4d6977268c610149da3e73..851af6c7e3a66d3c1be104b06b2c0da40de1cda3 100644 --- a/ansible/roles/glance/handlers/main.yml +++ b/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] diff --git a/ansible/roles/glance/tasks/bootstrap_service.yml b/ansible/roles/glance/tasks/bootstrap_service.yml index e749adced4f74fecc9ccda0268bd51a1c22011fc..4b3c5eb2cc3aa316c30ceb62b9d749f5d4f32f66 100644 --- a/ansible/roles/glance/tasks/bootstrap_service.yml +++ b/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] }}" diff --git a/ansible/roles/glance/tasks/config.yml b/ansible/roles/glance/tasks/config.yml index 1103d793202b3be4f7d0fe90285bcd797083600c..724d2001c4813b72c86effaeecf2c8285ca1eaef 100644 --- a/ansible/roles/glance/tasks/config.yml +++ b/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"