X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=installers%2Ffull_install_osm.sh;h=6f80953d933fae756239a2236b382cb706705032;hb=8c2b264d31baba3db57ce53ee2ef40e99f8930c0;hp=2f90bcf65864b1f2efcc4186bf1c3835ed7788af;hpb=a621368d4d043ff4222cb1ce9174e77aa4e094c6;p=osm%2Fdevops.git

diff --git a/installers/full_install_osm.sh b/installers/full_install_osm.sh
index 2f90bcf6..6f80953d 100755
--- a/installers/full_install_osm.sh
+++ b/installers/full_install_osm.sh
@@ -290,9 +290,17 @@ EOF"
     [ -n "${INSTALL_NGSA}" ] || OSM_HELM_OPTS="${OSM_HELM_OPTS} --set global.oldServiceAssurance=true"
     if [ -n "${OSM_BEHIND_PROXY}" ]; then
         OSM_HELM_OPTS="${OSM_HELM_OPTS} --set global.behindHttpProxy=true"
-        [ -n "${HTTP_PROXY}" ] && OSM_HELM_OPTS="${OSM_HELM_OPTS} --set global.httpProxy.HTTP_PROXY=${HTTP_PROXY}"
-        [ -n "${HTTPS_PROXY}" ] && OSM_HELM_OPTS="${OSM_HELM_OPTS} --set global.httpProxy.HTTPS_PROXY=${HTTPS_PROXY}"
-        [ -n "${NO_PROXY}" ] && OSM_HELM_OPTS="${OSM_HELM_OPTS} --set global.httpProxy.NO_PROXY=${NO_PROXY}"
+        [ -n "${HTTP_PROXY}" ] && OSM_HELM_OPTS="${OSM_HELM_OPTS} --set global.httpProxy.HTTP_PROXY=\"${HTTP_PROXY}\""
+        [ -n "${HTTPS_PROXY}" ] && OSM_HELM_OPTS="${OSM_HELM_OPTS} --set global.httpProxy.HTTPS_PROXY=\"${HTTPS_PROXY}\""
+        if [ -n "${NO_PROXY}" ]; then
+            if [[ ! "${NO_PROXY}" =~ .*".svc".* ]]; then
+                NO_PROXY="${NO_PROXY},.svc"
+            fi
+            if [[ ! "${NO_PROXY}" =~ .*".cluster.local".* ]]; then
+                NO_PROXY="${NO_PROXY},.cluster.local"
+            fi
+            OSM_HELM_OPTS="${OSM_HELM_OPTS} --set global.httpProxy.NO_PROXY=\"${NO_PROXY//,/\,}\""
+        fi
     fi
 
     if [ -n "${INSTALL_JUJU}" ]; then