From a8e99a68259f367f34592e4b889c3852d47e3184 Mon Sep 17 00:00:00 2001 From: Logan V Date: Wed, 12 Sep 2018 00:07:43 -0600 Subject: [PATCH] Only configure proxy on the compute hosts Since only the compute hosts are not connected to the internet, these are the only hosts in the environment that should require a proxy configuration. Change-Id: Ie3b8474fda2b6d2a0c2de4e18739824fec25fd3f --- openstack_deploy/group_vars/compute_hosts.yml | 11 +++++++++++ openstack_deploy/user_variables.yml | 11 ----------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/openstack_deploy/group_vars/compute_hosts.yml b/openstack_deploy/group_vars/compute_hosts.yml index 0af50a3..8258e7b 100644 --- a/openstack_deploy/group_vars/compute_hosts.yml +++ b/openstack_deploy/group_vars/compute_hosts.yml @@ -4,3 +4,14 @@ security_ntp_servers: - int.ntp1.lstn.net - int.ntp2.lstn.net + +# Proxy config +proxy_env_url: http://mirror.lstn.net:8995/ +no_proxy_env: "localhost,127.0.0.1,{{ internal_lb_vip_address }},{{ external_lb_vip_address }},mirror.lstn.net,{{ ansible_host }}" +global_environment_variables: + HTTP_PROXY: "{{ proxy_env_url }}" + HTTPS_PROXY: "{{ proxy_env_url }}" + NO_PROXY: "{{ no_proxy_env }}" + http_proxy: "{{ proxy_env_url }}" + https_proxy: "{{ proxy_env_url }}" + no_proxy: "{{ no_proxy_env }}" diff --git a/openstack_deploy/user_variables.yml b/openstack_deploy/user_variables.yml index b744fea..d421130 100644 --- a/openstack_deploy/user_variables.yml +++ b/openstack_deploy/user_variables.yml @@ -19,17 +19,6 @@ ssh_key_url: https://raw.githubusercontent.com/continuouspw/openstack-ci-cloud/m # contention in the database cluster galera_max_connections: 1500 -# Proxy config -proxy_env_url: http://mirror.lstn.net:8995/ -no_proxy_env: "localhost,127.0.0.1,{{ internal_lb_vip_address }},{{ external_lb_vip_address }},mirror.lstn.net,{{ ansible_host }}" -global_environment_variables: - HTTP_PROXY: "{{ proxy_env_url }}" - HTTPS_PROXY: "{{ proxy_env_url }}" - NO_PROXY: "{{ no_proxy_env }}" - http_proxy: "{{ proxy_env_url }}" - https_proxy: "{{ proxy_env_url }}" - no_proxy: "{{ no_proxy_env }}" - # Enable L2pop and disable vxlan multicast neutron_l2_population: True neutron_vxlan_group: