openstack/kolla-ansible
Code Issues Proposed changes

Merge "config proxy settings inside glance_api container"

Browse Source
This commit is contained in:
Zuul
2018-07-02 11:46:43 +00:00
committed by Gerrit Code Review
parent 716a428c62 87043bc918
commit f8848529fa
3 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
ansible/roles/glance/defaults/main.yml
View File

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

1
ansible/roles/glance/handlers/main.yml
View File

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

1
ansible/roles/glance/tasks/config.yml
View File

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