diff --git a/tests/roles/bootstrap-host/files/user_variables_proxy.yml b/tests/roles/bootstrap-host/files/user_variables_proxy.yml new file mode 100644 index 0000000000..30605577a6 --- /dev/null +++ b/tests/roles/bootstrap-host/files/user_variables_proxy.yml @@ -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 }}" diff --git a/tests/roles/bootstrap-host/tasks/prepare_aio_config.yml b/tests/roles/bootstrap-host/tasks/prepare_aio_config.yml index c59e258731..6acd03160e 100644 --- a/tests/roles/bootstrap-host/tasks/prepare_aio_config.yml +++ b/tests/roles/bootstrap-host/tasks/prepare_aio_config.yml @@ -156,6 +156,13 @@ config_overrides: "{{ user_variables_overrides | default({}) }}" 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 config_template: src: "{{ item.src }}"