Skip to content
Snippets Groups Projects
Commit 87043bc9 authored by Mark Duggan's avatar Mark Duggan Committed by zhulingjie
Browse files

config proxy settings inside glance_api container


Adding the capability to configure settings for http_proxy https_proxy
and no_proxy inside glance_api container. This is required when import
images from external http resources behind a proxy.

Co-Authored-By: default avatarPaul Bourke <paul.bourke@oracle.com>
Closes-bug: #1775815
Change-Id: I85661f04311d5671adecc84c470f2e4db07cfe1d
parent ab5fd56b
No related branches found
No related tags found
No related merge requests found
...@@ -7,6 +7,7 @@ glance_services: ...@@ -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"
......
...@@ -13,6 +13,7 @@ ...@@ -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"
......
...@@ -118,6 +118,7 @@ ...@@ -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:
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment