Code Review / demo.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | patch | inline | side by side (parent: 534ba4b)
Bug fix on HEAT template HTTP_PROXY 77/56677/2
authorgwu <gary.i.wu@huawei.com>
Wed, 18 Jul 2018 05:36:47 +0000 (22:36 -0700)
committergwu <gary.i.wu@huawei.com>
Wed, 18 Jul 2018 05:50:41 +0000 (22:50 -0700)
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:
boot/aaf_install.sh patch | blob | history
boot/aaf_serv.sh patch | blob | history
boot/aai_serv.sh patch | blob | history
boot/appc_serv.sh patch | blob | history
boot/clamp_serv.sh patch | blob | history
boot/dcae2_serv.sh patch | blob | history
boot/mr_serv.sh patch | blob | history
boot/music_serv.sh patch | blob | history
boot/nbi_serv.sh patch | blob | history
boot/oof_serv.sh patch | blob | history
boot/openo_all_serv.sh patch | blob | history
boot/openo_serv.sh patch | blob | history
boot/policy_serv.sh patch | blob | history
boot/portal_serv.sh patch | blob | history
boot/robot_serv.sh patch | blob | history
boot/sdc_serv.sh patch | blob | history
boot/sdnc_serv.sh patch | blob | history
boot/sms_serv.sh patch | blob | history
boot/so_serv.sh patch | blob | history
boot/vid_serv.sh patch | blob | history
heat/ONAP/onap_openstack.yaml patch | blob | history

diff --git a/boot/aaf_install.sh b/boot/aaf_install.sh
index ab7bcf7..882c3ee 100644 (file)
--- 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 51391b8..597969b 100644 (file)
--- 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 dc93be6..09949bb 100644 (file)
--- 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 de9c259..6947b9f 100644 (file)
--- 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 edda393..2c3a898 100644 (file)
--- 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 b05a895..cfb77e4 100644 (file)
--- 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 505beb8..9e324dc 100644 (file)
--- 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 849d2eb..11b95a1 100644 (file)
--- 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 a9390b8..9c4eea0 100644 (file)
--- 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 01fb3fd..4e73ac8 100644 (file)
--- 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 e677683..57de290 100644 (file)
--- 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 c46329a..71f0245 100644 (file)
--- 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 cad2720..f5e2b23 100644 (file)
--- 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 1995488..d27e469 100644 (file)
--- 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 d1203e5..656b9af 100644 (file)
--- 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 a2bb3d1..8083cb7 100644 (file)
--- 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 cce2039..e5bb37e 100644 (file)
--- 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 2bbf255..06310db 100644 (file)
--- 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 762d2e1..48e7259 100644 (file)
--- 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 91b4d24..8e92d20 100644 (file)
--- 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 771cdfb..2eaaf73 100644 (file)
--- 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'
 
   ######################
   #                    #
Demo applications and templates for ONAP platform instantiation.