aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrian Freeman <bf1936@att.com>2019-04-15 17:23:09 +0000
committerGerrit Code Review <gerrit@onap.org>2019-04-15 17:23:09 +0000
commitbce23ab2e95908624a11e21c8751d7791e15c4ef (patch)
treea406609674e5d0a30e96a991934084d59aa42649
parentbb24444954aa1f6235c93103f90157b412121da2 (diff)
parenta7f1a945209f4c68c6c871318c07b8f032e95a87 (diff)
Merge "Temporarily disable portal URL override in RKE"
-rw-r--r--deployment/heat/onap-rke/env/windriver/onap-oom.env15
-rw-r--r--deployment/heat/onap-rke/rancher_vm_entrypoint.sh4
2 files changed, 2 insertions, 17 deletions
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"