openstack/openstack-ansible
Code Issues Proposed changes

Merge "Allow AIO to automatically use an http proxy"

Browse Source
This commit is contained in:
Zuul 2018-07-24 17:35:17 +00:00 committed by Gerrit Code Review
commit bea8db0835
2 changed files with 18 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
tests/roles/bootstrap-host/files/user_variables_proxy.yml Normal file
View File

@ -0,0 +1,11 @@
---
no_proxy_env: "localhost,127.0.0.1,{{ internal_lb_vip_address }},{{ external_lb_vip_address }},{% for host in groups['all_containers'] %}{{ hostvars[host]['container_address'] }}{% if not loop.last %},{% endif %}{% endfor %}"
http_proxy_env: "{{ lookup('env', 'http_proxy') }}"
https_proxy_env: "{{ lookup('env', 'https_proxy') }}"
global_environment_variables:
HTTP_PROXY: "{{ http_proxy_env }}"
HTTPS_PROXY: "{{ https_proxy_env }}"
http_proxy: "{{ http_proxy_env }}"
https_proxy: "{{ https_proxy_env }}"
NO_PROXY: "{{ no_proxy_env }}"
no_proxy: "{{ no_proxy_env }}"

7
tests/roles/bootstrap-host/tasks/prepare_aio_config.yml
View File

@ -156,6 +156,13 @@
config_overrides: "{{ user_variables_overrides | default({}) }}" config_overrides: "{{ user_variables_overrides | default({}) }}"
config_type: yaml config_type: yaml
- name: Set http proxy user variables
copy:
src: "user_variables_proxy.yml"
dest: "/etc/openstack_deploy/user_variables_proxy.yml"
when:
- "lookup('env', 'http_proxy')|length > 0"
- name: Drop the extra user_variables files for this scenario - name: Drop the extra user_variables files for this scenario
config_template: config_template:
src: "{{ item.src }}" src: "{{ item.src }}"