Temporarily disable portal URL override

Temporarily disable portal URL override to debug
portal login issues

Change-Id: Icbbc702dd2e0a44e2f8506eea4b2174b6a9a9e25
Issue-ID: INT-658
Signed-off-by: Gary Wu <gary.i.wu@huawei.com>

diff --git a/deployment/heat/onap-oom/env/windriver/onap-oom.env b/deployment/heat/onap-oom/env/windriver/onap-oom.env
index ace449c..5ad7bc0 100644 (file)
--- a/deployment/heat/onap-oom/env/windriver/onap-oom.env
+++ b/deployment/heat/onap-oom/env/windriver/onap-oom.env
@@ -85,22 +85,22 @@ parameters:
           initialDelaySeconds: 120
     portal:
       enabled: true
-      global:
-        portalHostName: "__portal_hostname__"
-      portal-mariadb:
-        config:
-          sdcFeHostName: "__portal_hostname__"
-          papHostName: "__portal_hostname__"
-          vidHostName: "__portal_hostname__"
-          aaiSparkyHostName: "__portal_hostname__"
-          cliHostName: "__portal_hostname__"
-          portalSdkHostName: "__portal_hostname__"
-          dmaapBcHostName: "__portal_hostname__"
-          msbHostName: "__portal_hostname__"
+    #  global:
+    #    portalHostName: "__portal_hostname__"
+    #  portal-mariadb:
+    #    config:
+    #      sdcFeHostName: "__portal_hostname__"
+    #      papHostName: "__portal_hostname__"
+    #      vidHostName: "__portal_hostname__"
+    #      aaiSparkyHostName: "__portal_hostname__"
+    #      cliHostName: "__portal_hostname__"
+    #      portalSdkHostName: "__portal_hostname__"
+    #      dmaapBcHostName: "__portal_hostname__"
+    #      msbHostName: "__portal_hostname__"
     vid:
       enabled: true
-      config:
-        portalhost: "__portal_hostname__"
+    #  config:
+    #    portalhost: "__portal_hostname__"
 
     aaf:
       enabled: true

diff --git a/deployment/heat/onap-oom/rancher_vm_entrypoint.sh b/deployment/heat/onap-oom/rancher_vm_entrypoint.sh
index 56acd91..0ea9b62 100644 (file)
--- a/deployment/heat/onap-oom/rancher_vm_entrypoint.sh
+++ b/deployment/heat/onap-oom/rancher_vm_entrypoint.sh
@@ -300,10 +300,10 @@ git commit -a -m "apply manifest versions"
 
 cd ~/oom
 # workaround to change onap portal cookie domain
-sed -i "s/^cookie_domain.*=.*/cookie_domain = __portal_hostname__/g" ./kubernetes/portal/charts/portal-app/resources/config/deliveries/properties/ONAPPORTAL/system.properties
-sed -i "s/^cookie_domain.*=.*/cookie_domain = __portal_hostname__/g" ./kubernetes/portal/charts/portal-sdk/resources/config/deliveries/properties/ONAPPORTALSDK/system.properties
-git diff
-git commit -a -m "set portal cookie domain"
+#sed -i "s/^cookie_domain.*=.*/cookie_domain = __portal_hostname__/g" ./kubernetes/portal/charts/portal-app/resources/config/deliveries/properties/ONAPPORTAL/system.properties
+#sed -i "s/^cookie_domain.*=.*/cookie_domain = __portal_hostname__/g" ./kubernetes/portal/charts/portal-sdk/resources/config/deliveries/properties/ONAPPORTALSDK/system.properties
+#git diff
+#git commit -a -m "set portal cookie domain"
 
 git tag -a "deploy0" -m "initial deployment"