openstack/openstack-ansible-ops
Code Issues Proposed changes

Pass deployment_environment_variables to OSA

Browse Source 
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
This commit is contained in:
Stuart Grace 2017-08-08 18:53:45 +01:00 committed by Kevin Carter (cloudnull)
parent 21acc02601
commit 27531d4a97
1 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
multi-node-aio/playbooks/osa/user_mnaio_variables.yml
View File

@ -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: