openstack/openstack-ansible-ops
Code Issues Proposed changes

Allow unset varaibles when checking http_proxy

Browse Source 
The build.sh script uses set -eu, which causes this script to
fail if http_proxy is not set.

Change-Id: I5a71106db13fcd7c7c5fe5bc3350441e556759c1
This commit is contained in:
Melissa Kam 2017-02-22 10:56:35 -06:00
parent 83201edfb5
commit fac7844a32
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
multi-node-aio/deploy-osa.sh
View File

@ -107,7 +107,7 @@ if [[ "${PRE_CONFIG_OSA}" = true ]]; then
osa_user_var_add glance_default_store 'glance_default_store: swift'
# Propagate host proxy settings (if set) into /etc/environment in the targets
if [ -n "$http_proxy" ]; then
if [ ! -z ${http_proxy+x} ]; then
osa_user_var_add proxy_env_url 'proxy_env_url: '${http_proxy}
osa_user_var_add no_proxy_env '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 %}"'
osa_user_var_add global_environment_variables 'global_environment_variables:'