Merge "config proxy settings inside glance_api container"

This commit is contained in:
Zuul 2018-07-02 11:46:43 +00:00 committed by Gerrit Code Review
commit f8848529fa
3 changed files with 3 additions and 0 deletions

View File

@ -7,6 +7,7 @@ glance_services:
group: glance-api
enabled: true
image: "{{ glance_api_image_full }}"
environment: "{{ container_proxy }}"
volumes:
- "{{ node_config_directory }}/glance-api/:{{ container_config_directory }}/:ro"
- "/etc/localtime:/etc/localtime:ro"

View File

@ -13,6 +13,7 @@
common_options: "{{ docker_common_options }}"
name: "{{ service.container_name }}"
image: "{{ service.image }}"
environment: "{{ service.environment }}"
volumes: "{{ service.volumes|reject('equalto', '')|list }}"
when:
- kolla_action != "config"

View File

@ -118,6 +118,7 @@
common_options: "{{ docker_common_options }}"
name: "{{ item.value.container_name }}"
image: "{{ item.value.image }}"
environment: "{{ item.value.environment | default(omit) }}"
volumes: "{{ item.value.volumes|reject('equalto', '')|list }}"
register: check_glance_containers
when: