openstack/openstack-ansible
Code Issues Proposed changes

Improve proxy vars in user_variables.yml

Browse Source 
1. Change comments to make it clear that proxy_env_url is used by
apt-cacher-ng and must always be set when an http proxy is required.

2. Add keystone hosts to no_proxy list in deployment env vars
because os_keystone role tests this addess to check services are
up.

Change-Id: If147754f3ddd7727f17e8c33e5a0583ab87ffacc
This commit is contained in:
Stuart Grace
2017-08-08 13:58:50 +01:00
committed by Major Hayden
parent 686c9f3763
commit 1b7628b366
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
etc/openstack_deploy/user_variables.yml
View File

@@ -118,8 +118,10 @@ debug: false
# placed both on the hosts and inside the containers. # placed both on the hosts and inside the containers.
## Example environment variable setup: ## Example environment variable setup:
## (1) This sets up a permanent environment, used during and after deployment: ## This is used by apt-cacher-ng to download apt packages:
# proxy_env_url: http://username:pa$$w0rd@10.10.10.9:9000/ # proxy_env_url: http://username:pa$$w0rd@10.10.10.9:9000/
## (1) This sets up a permanent environment, used during and after deployment:
# 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: # global_environment_variables:
# HTTP_PROXY: "{{ proxy_env_url }}" # HTTP_PROXY: "{{ proxy_env_url }}"
@@ -131,9 +133,9 @@ debug: false
# #
## (2) This is applied only during deployment, nothing is left after deployment is complete: ## (2) This is applied only during deployment, nothing is left after deployment is complete:
# deployment_environment_variables: # deployment_environment_variables:
# http_proxy: http://username:pa$$w0rd@10.10.10.9:9000/ # http_proxy: "{{ proxy_env_url }}"
# https_proxy: http://username:pa$$w0rd@10.10.10.9:9000/ # https_proxy: "{{ proxy_env_url }}"
# no_proxy: "localhost,127.0.0.1,{{ internal_lb_vip_address }},{{ external_lb_vip_address }}" # 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 %}"
## SSH connection wait time ## SSH connection wait time