Bug fix on HEAT template HTTP_PROXY

Various boot scripts should have been checking for "no_proxy"
but were checking for " " instead.  This fixes the issue.

Also add default values for HTTP_PROXY variables.

Change-Id: I5245018a7bb9c33b84ac3096d8a9c0986b2e976c
Issue-ID: OOM-1275
Signed-off-by: gwu <gary.i.wu@huawei.com>

21 files changed, 22 insertions, 20 deletions

diff --git a/boot/aaf_install.sh b/boot/aaf_install.sh
index ab7bcf78..882c3ee4 100644
--- a/boot/aaf_install.sh
+++ b/boot/aaf_install.sh
@@ -10,7 +10,7 @@ CODE_REPO=$(cat /opt/config/remote_repo.txt)
 HTTP_PROXY=$(cat /opt/config/http_proxy.txt)
 HTTPS_PROXY=$(cat /opt/config/https_proxy.txt)
 
-if [ $HTTP_PROXY != " " ]
+if [ $HTTP_PROXY != "no_proxy" ]
 then
     export http_proxy=$HTTP_PROXY
     export https_proxy=$HTTPS_PROXY
diff --git a/boot/aaf_serv.sh b/boot/aaf_serv.sh
index 51391b84..597969bc 100644
--- a/boot/aaf_serv.sh
+++ b/boot/aaf_serv.sh
@@ -12,7 +12,7 @@
 HTTP_PROXY=$(cat /opt/config/http_proxy.txt)
 HTTPS_PROXY=$(cat /opt/config/https_proxy.txt)
 
-if [ $HTTP_PROXY != " " ]
+if [ $HTTP_PROXY != "no_proxy" ]
 then
     export http_proxy=$HTTP_PROXY
     export https_proxy=$HTTPS_PROXY
diff --git a/boot/aai_serv.sh b/boot/aai_serv.sh
index dc93be64..09949bb9 100644
--- a/boot/aai_serv.sh
+++ b/boot/aai_serv.sh
@@ -11,7 +11,7 @@
 HTTP_PROXY=$(cat /opt/config/http_proxy.txt)
 HTTPS_PROXY=$(cat /opt/config/https_proxy.txt)
 
-if [ $HTTP_PROXY != " " ]
+if [ $HTTP_PROXY != "no_proxy" ]
 then
     export http_proxy=$HTTP_PROXY
     export https_proxy=$HTTPS_PROXY
diff --git a/boot/appc_serv.sh b/boot/appc_serv.sh
index de9c2594..6947b9f6 100644
--- a/boot/appc_serv.sh
+++ b/boot/appc_serv.sh
@@ -11,7 +11,7 @@
 HTTP_PROXY=$(cat /opt/config/http_proxy.txt)
 HTTPS_PROXY=$(cat /opt/config/https_proxy.txt)
 
-if [ $HTTP_PROXY != " " ]
+if [ $HTTP_PROXY != "no_proxy" ]
 then
     export http_proxy=$HTTP_PROXY
     export https_proxy=$HTTPS_PROXY
diff --git a/boot/clamp_serv.sh b/boot/clamp_serv.sh
index edda3939..2c3a898a 100644
--- a/boot/clamp_serv.sh
+++ b/boot/clamp_serv.sh
@@ -11,7 +11,7 @@
 HTTP_PROXY=$(cat /opt/config/http_proxy.txt)
 HTTPS_PROXY=$(cat /opt/config/https_proxy.txt)
 
-if [ $HTTP_PROXY != " " ]
+if [ $HTTP_PROXY != "no_proxy" ]
 then
     export http_proxy=$HTTP_PROXY
     export https_proxy=$HTTPS_PROXY
diff --git a/boot/dcae2_serv.sh b/boot/dcae2_serv.sh
index b05a8958..cfb77e45 100644
--- a/boot/dcae2_serv.sh
+++ b/boot/dcae2_serv.sh
@@ -28,7 +28,7 @@
 HTTP_PROXY=$(cat /opt/config/http_proxy.txt)
 HTTPS_PROXY=$(cat /opt/config/https_proxy.txt)
 
-if [ $HTTP_PROXY != " " ]
+if [ $HTTP_PROXY != "no_proxy" ]
 then
     export http_proxy=$HTTP_PROXY
     export https_proxy=$HTTPS_PROXY
diff --git a/boot/mr_serv.sh b/boot/mr_serv.sh
index 505beb8b..9e324dc0 100644
--- a/boot/mr_serv.sh
+++ b/boot/mr_serv.sh
@@ -29,7 +29,7 @@
 HTTP_PROXY=$(cat /opt/config/http_proxy.txt)
 HTTPS_PROXY=$(cat /opt/config/https_proxy.txt)
 
-if [ $HTTP_PROXY != " " ]
+if [ $HTTP_PROXY != "no_proxy" ]
 then
     export http_proxy=$HTTP_PROXY
     export https_proxy=$HTTPS_PROXY
diff --git a/boot/music_serv.sh b/boot/music_serv.sh
index 849d2eba..11b95a12 100644
--- a/boot/music_serv.sh
+++ b/boot/music_serv.sh
@@ -11,7 +11,7 @@
 HTTP_PROXY=$(cat /opt/config/http_proxy.txt)
 HTTPS_PROXY=$(cat /opt/config/https_proxy.txt)
 
-if [ $HTTP_PROXY != " " ]
+if [ $HTTP_PROXY != "no_proxy" ]
 then
     export http_proxy=$HTTP_PROXY
     export https_proxy=$HTTPS_PROXY
diff --git a/boot/nbi_serv.sh b/boot/nbi_serv.sh
index a9390b8a..9c4eea02 100644
--- a/boot/nbi_serv.sh
+++ b/boot/nbi_serv.sh
@@ -11,7 +11,7 @@
 HTTP_PROXY=$(cat /opt/config/http_proxy.txt)
 HTTPS_PROXY=$(cat /opt/config/https_proxy.txt)
 
-if [ $HTTP_PROXY != " " ]
+if [ $HTTP_PROXY != "no_proxy" ]
 then
     export http_proxy=$HTTP_PROXY
     export https_proxy=$HTTPS_PROXY
diff --git a/boot/oof_serv.sh b/boot/oof_serv.sh
index 01fb3fd3..4e73ac88 100644
--- a/boot/oof_serv.sh
+++ b/boot/oof_serv.sh
@@ -11,7 +11,7 @@
 HTTP_PROXY=$(cat /opt/config/http_proxy.txt)
 HTTPS_PROXY=$(cat /opt/config/https_proxy.txt)
 
-if [ $HTTP_PROXY != " " ]
+if [ $HTTP_PROXY != "no_proxy" ]
 then
     export http_proxy=$HTTP_PROXY
     export https_proxy=$HTTPS_PROXY
diff --git a/boot/openo_all_serv.sh b/boot/openo_all_serv.sh
index e6776830..57de2908 100644
--- a/boot/openo_all_serv.sh
+++ b/boot/openo_all_serv.sh
@@ -2,7 +2,7 @@
 HTTP_PROXY=$(cat /opt/config/http_proxy.txt)
 HTTPS_PROXY=$(cat /opt/config/https_proxy.txt)
 
-if [ $HTTP_PROXY != " " ]
+if [ $HTTP_PROXY != "no_proxy" ]
 then
     export http_proxy=$HTTP_PROXY
     export https_proxy=$HTTPS_PROXY
diff --git a/boot/openo_serv.sh b/boot/openo_serv.sh
index c46329ad..71f0245d 100644
--- a/boot/openo_serv.sh
+++ b/boot/openo_serv.sh
@@ -11,7 +11,7 @@
 HTTP_PROXY=$(cat /opt/config/http_proxy.txt)
 HTTPS_PROXY=$(cat /opt/config/https_proxy.txt)
 
-if [ $HTTP_PROXY != " " ]
+if [ $HTTP_PROXY != "no_proxy" ]
 then
     export http_proxy=$HTTP_PROXY
     export https_proxy=$HTTPS_PROXY
diff --git a/boot/policy_serv.sh b/boot/policy_serv.sh
index cad27206..f5e2b230 100644
--- a/boot/policy_serv.sh
+++ b/boot/policy_serv.sh
@@ -11,7 +11,7 @@
 HTTP_PROXY=$(cat /opt/config/http_proxy.txt)
 HTTPS_PROXY=$(cat /opt/config/https_proxy.txt)
 
-if [ $HTTP_PROXY != " " ]
+if [ $HTTP_PROXY != "no_proxy" ]
 then
     export http_proxy=$HTTP_PROXY
     export https_proxy=$HTTPS_PROXY
diff --git a/boot/portal_serv.sh b/boot/portal_serv.sh
index 19954880..d27e4693 100644
--- a/boot/portal_serv.sh
+++ b/boot/portal_serv.sh
@@ -11,7 +11,7 @@
 HTTP_PROXY=$(cat /opt/config/http_proxy.txt)
 HTTPS_PROXY=$(cat /opt/config/https_proxy.txt)
 
-if [ $HTTP_PROXY != " " ]
+if [ $HTTP_PROXY != "no_proxy" ]
 then
     export http_proxy=$HTTP_PROXY
     export https_proxy=$HTTPS_PROXY
diff --git a/boot/robot_serv.sh b/boot/robot_serv.sh
index d1203e5e..656b9afb 100644
--- a/boot/robot_serv.sh
+++ b/boot/robot_serv.sh
@@ -11,7 +11,7 @@
 HTTP_PROXY=$(cat /opt/config/http_proxy.txt)
 HTTPS_PROXY=$(cat /opt/config/https_proxy.txt)
 
-if [ $HTTP_PROXY != " " ]
+if [ $HTTP_PROXY != "no_proxy" ]
 then
     export http_proxy=$HTTP_PROXY
     export https_proxy=$HTTPS_PROXY
diff --git a/boot/sdc_serv.sh b/boot/sdc_serv.sh
index a2bb3d11..8083cb7e 100644
--- a/boot/sdc_serv.sh
+++ b/boot/sdc_serv.sh
@@ -11,7 +11,7 @@
 HTTP_PROXY=$(cat /opt/config/http_proxy.txt)
 HTTPS_PROXY=$(cat /opt/config/https_proxy.txt)
 
-if [ $HTTP_PROXY != " " ]
+if [ $HTTP_PROXY != "no_proxy" ]
 then
     export http_proxy=$HTTP_PROXY
     export https_proxy=$HTTPS_PROXY
diff --git a/boot/sdnc_serv.sh b/boot/sdnc_serv.sh
index cce2039c..e5bb37ea 100644
--- a/boot/sdnc_serv.sh
+++ b/boot/sdnc_serv.sh
@@ -11,7 +11,7 @@
 HTTP_PROXY=$(cat /opt/config/http_proxy.txt)
 HTTPS_PROXY=$(cat /opt/config/https_proxy.txt)
 
-if [ $HTTP_PROXY != " " ]
+if [ $HTTP_PROXY != "no_proxy" ]
 then
     export http_proxy=$HTTP_PROXY
     export https_proxy=$HTTPS_PROXY
diff --git a/boot/sms_serv.sh b/boot/sms_serv.sh
index 2bbf255d..06310db7 100644
--- a/boot/sms_serv.sh
+++ b/boot/sms_serv.sh
@@ -11,7 +11,7 @@
 HTTP_PROXY=$(cat /opt/config/http_proxy.txt)
 HTTPS_PROXY=$(cat /opt/config/https_proxy.txt)
 
-if [ $HTTP_PROXY != " " ]
+if [ $HTTP_PROXY != "no_proxy" ]
 then
     export http_proxy=$HTTP_PROXY
     export https_proxy=$HTTPS_PROXY
diff --git a/boot/so_serv.sh b/boot/so_serv.sh
index 762d2e1b..48e7259e 100644
--- a/boot/so_serv.sh
+++ b/boot/so_serv.sh
@@ -11,7 +11,7 @@
 HTTP_PROXY=$(cat /opt/config/http_proxy.txt)
 HTTPS_PROXY=$(cat /opt/config/https_proxy.txt)
 
-if [ $HTTP_PROXY != " " ]
+if [ $HTTP_PROXY != "no_proxy" ]
 then
     export http_proxy=$HTTP_PROXY
     export https_proxy=$HTTPS_PROXY
diff --git a/boot/vid_serv.sh b/boot/vid_serv.sh
index 91b4d248..8e92d204 100644
--- a/boot/vid_serv.sh
+++ b/boot/vid_serv.sh
@@ -11,7 +11,7 @@
 HTTP_PROXY=$(cat /opt/config/http_proxy.txt)
 HTTPS_PROXY=$(cat /opt/config/https_proxy.txt)
 
-if [ $HTTP_PROXY != " " ]
+if [ $HTTP_PROXY != "no_proxy" ]
 then
     export http_proxy=$HTTP_PROXY
     export https_proxy=$HTTPS_PROXY
diff --git a/heat/ONAP/onap_openstack.yaml b/heat/ONAP/onap_openstack.yaml
index 771cdfb2..2eaaf738 100644
--- a/heat/ONAP/onap_openstack.yaml
+++ b/heat/ONAP/onap_openstack.yaml
@@ -144,10 +144,12 @@ parameters:
   http_proxy:
     type: string
     description: http proxy address
+    default: 'no_proxy'
 
   https_proxy:
     type: string
     description: https proxy address
+    default: 'no_proxy'
 
   ######################
   #                    #