From: Gary Wu <gary.i.wu@huawei.com>
Date: Mon, 15 Apr 2019 16:09:20 +0000 (-0700)
Subject: Temporarily disable portal URL override in RKE
X-Git-Tag: 4.0.0-ONAP~174^2
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F45%2F85345%2F1;p=integration.git

Temporarily disable portal URL override in RKE

Temporarily disable portal URL override in RKE
to debug portal login issues

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

diff --git a/deployment/heat/onap-rke/env/windriver/onap-oom.env b/deployment/heat/onap-rke/env/windriver/onap-oom.env
index a884bfd8b..88c4defc4 100644
--- a/deployment/heat/onap-rke/env/windriver/onap-oom.env
+++ b/deployment/heat/onap-rke/env/windriver/onap-oom.env
@@ -91,18 +91,6 @@ parameters:
           periodSeconds: 600
     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__"
       portal-cassandra:
         liveness:
           periodSeconds: 600
@@ -110,9 +98,6 @@ parameters:
           periodSeconds: 600
     vid:
       enabled: true
-      config:
-        portalhost: "__portal_hostname__"
-
     aaf:
       enabled: true
     cassandra:
diff --git a/deployment/heat/onap-rke/rancher_vm_entrypoint.sh b/deployment/heat/onap-rke/rancher_vm_entrypoint.sh
index 51a3fabbe..42a8fe055 100644
--- a/deployment/heat/onap-rke/rancher_vm_entrypoint.sh
+++ b/deployment/heat/onap-rke/rancher_vm_entrypoint.sh
@@ -168,8 +168,8 @@ 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
+#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"