From 27531d4a97923d4db57d274442f24879bd144312 Mon Sep 17 00:00:00 2001 From: Stuart Grace Date: Tue, 8 Aug 2017 18:53:45 +0100 Subject: [PATCH] Pass deployment_environment_variables to OSA When using environment variables to setup a proxy, it checks whether global_environment_variables (for permanent proxy) or deployment_environment_variables (for playbooks only) is in use and sets up matching user_variables for OSA. Previously, it only setup global environment variables. Added | bool filters as suggested in review. Change-Id: I6554cd28f817ab0d128a1a469a6007b043851c07 --- .../playbooks/osa/user_mnaio_variables.yml | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/multi-node-aio/playbooks/osa/user_mnaio_variables.yml b/multi-node-aio/playbooks/osa/user_mnaio_variables.yml index 95bf20e4..efd7bba0 100644 --- a/multi-node-aio/playbooks/osa/user_mnaio_variables.yml +++ b/multi-node-aio/playbooks/osa/user_mnaio_variables.yml @@ -13,8 +13,10 @@ glance_default_store: swift {% if http_proxy is defined and http_proxy %} proxy_env_url: "{{ http_proxy }}" + +{% if global_environment_variables is defined and global_environment_variables | bool %} {% raw %} -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 %}" +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 %}" global_environment_variables: HTTP_PROXY: "{{ proxy_env_url }}" HTTPS_PROXY: "{{ proxy_env_url }}" @@ -23,6 +25,16 @@ global_environment_variables: https_proxy: "{{ proxy_env_url }}" no_proxy: "{{ no_proxy_env }}" {% endraw %} +{% endif %} + +{% if deployment_environment_variables is defined and deployment_environment_variables | bool %} +{% raw %} +deployment_environment_variables: + http_proxy: "{{ proxy_env_url }}" + https_proxy: "{{ proxy_env_url }}" + no_proxy: "localhost,127.0.0.1,{{ internal_lb_vip_address }},{{ external_lb_vip_address }},{% for host in groups['keystone_all'] %}{{ hostvars[host]['container_address'] }}{% if not loop.last %},{% endif %}{% endfor %}" +{% endraw %} +{% endif %} glance_glance_api_conf_overrides: glance_store: