From fac7844a320b973233b6ca9929c5b9f8ba29445f Mon Sep 17 00:00:00 2001 From: Melissa Kam Date: Wed, 22 Feb 2017 10:56:35 -0600 Subject: [PATCH] Allow unset varaibles when checking http_proxy The build.sh script uses set -eu, which causes this script to fail if http_proxy is not set. Change-Id: I5a71106db13fcd7c7c5fe5bc3350441e556759c1 --- multi-node-aio/deploy-osa.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/multi-node-aio/deploy-osa.sh b/multi-node-aio/deploy-osa.sh index c18bcb28..0fd2a649 100755 --- a/multi-node-aio/deploy-osa.sh +++ b/multi-node-aio/deploy-osa.sh @@ -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:'