From 1b7628b3666e3b8dfd70e04f27e5954b44a318b1 Mon Sep 17 00:00:00 2001 From: Stuart Grace Date: Tue, 8 Aug 2017 13:58:50 +0100 Subject: [PATCH] Improve proxy vars in user_variables.yml 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 --- etc/openstack_deploy/user_variables.yml | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/etc/openstack_deploy/user_variables.yml b/etc/openstack_deploy/user_variables.yml index da81c95799..a71a805180 100644 --- a/etc/openstack_deploy/user_variables.yml +++ b/etc/openstack_deploy/user_variables.yml @@ -118,8 +118,10 @@ debug: false # placed both on the hosts and inside the containers. ## 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/ + +## (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 %}" # global_environment_variables: # 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: # deployment_environment_variables: -# http_proxy: http://username:pa$$w0rd@10.10.10.9:9000/ -# https_proxy: http://username:pa$$w0rd@10.10.10.9:9000/ -# no_proxy: "localhost,127.0.0.1,{{ internal_lb_vip_address }},{{ external_lb_vip_address }}" +# 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 %}" ## SSH connection wait time