summaryrefslogtreecommitdiffstats
path: root/kubernetes/portal
diff options
context:
space:
mode:
authorMandeep Khinda <mandeep.khinda@amdocs.com>2017-10-17 18:08:34 +0000
committerMandeep Khinda <mandeep.khinda@amdocs.com>2017-10-17 18:32:01 +0000
commit90ec5988cd666fef2495cc70d2af9f79ddfece47 (patch)
treead0b1ff9e044349f9409eee4a5a3b0f9ca3d67c6 /kubernetes/portal
parentb3d922104a22248e6304e9c6f595e3438bb366da (diff)
Synching up portal config
-moving container tags to 1.3 -pulling latest docker config mount files -changing mariadb password back to original. there was no reason to change in the first place -robot health check passes: Basic Portal Health Check | PASS | Issue-ID: OOM-340 Change-Id: I77d22b701aa27473a9cfce25031c13f9be845dae Signed-off-by: Mandeep Khinda <mandeep.khinda@amdocs.com>
Diffstat (limited to 'kubernetes/portal')
-rwxr-xr-xkubernetes/portal/templates/portal-apps-deployment.yaml10
-rwxr-xr-xkubernetes/portal/templates/portal-mariadb-deployment.yaml4
-rw-r--r--kubernetes/portal/values.yaml6
3 files changed, 6 insertions, 14 deletions
diff --git a/kubernetes/portal/templates/portal-apps-deployment.yaml b/kubernetes/portal/templates/portal-apps-deployment.yaml
index 13cf57093d..c9cb645bae 100755
--- a/kubernetes/portal/templates/portal-apps-deployment.yaml
+++ b/kubernetes/portal/templates/portal-apps-deployment.yaml
@@ -38,7 +38,7 @@ spec:
"name": "portalapps-readiness"
},
{
- "command": ["/bin/bash", "-c", "if [ ! -e /portal_root/boot.txt ]; then mysql -u root -ppassword -h portaldb < /portal-mysql/oom_updates.sql; fi"],
+ "command": ["/bin/bash", "-c", "if [ ! -e /portal_root/boot.txt ]; then mysql -u root -pAa123456 -h portaldb < /portal-mysql/oom_updates.sql; fi"],
"volumeMounts": [
{
"mountPath": "/portal-mysql/oom_updates.sql",
@@ -77,14 +77,6 @@ spec:
name: portal-portal-properties
- mountPath: "{{ .Values.onapPortal.webappsDir }}/ECOMPPORTAL/WEB-INF/classes/logback.xml"
name: portal-logback
- - mountPath: "{{ .Values.onapPortal.webappsDir }}/ECOMPDBCAPP/WEB-INF/fusion/conf/fusion.properties"
- name: dbcapp-fusion-properties
- - mountPath: "{{ .Values.onapPortal.webappsDir }}/ECOMPDBCAPP/WEB-INF/conf/system.properties"
- name: dbcapp-system-properties
- - mountPath: "{{ .Values.onapPortal.webappsDir }}/ECOMPDBCAPP/WEB-INF/classes/portal.properties"
- name: dbcapp-portal-properties
- - mountPath: "{{ .Values.onapPortal.webappsDir }}/ECOMPDBCAPP/WEB-INF/dbcapp/dbcapp.properties"
- name: dbcapp-dbcapp-properties
- mountPath: "{{ .Values.onapPortal.webappsDir }}/ECOMPSDKAPP/WEB-INF/conf/system.properties"
name: sdkapp-system-properties
- mountPath: "{{ .Values.onapPortal.webappsDir }}/ECOMPSDKAPP/WEB-INF/classes/portal.properties"
diff --git a/kubernetes/portal/templates/portal-mariadb-deployment.yaml b/kubernetes/portal/templates/portal-mariadb-deployment.yaml
index df38a2abb3..8dc7ebabf3 100755
--- a/kubernetes/portal/templates/portal-mariadb-deployment.yaml
+++ b/kubernetes/portal/templates/portal-mariadb-deployment.yaml
@@ -14,14 +14,14 @@ spec:
name: portaldb
spec:
containers:
- - image: {{ .Values.image.portaldb}}
+ - image: {{ .Values.image.portaldb}}
imagePullPolicy: {{ .Values.pullPolicy }}
name: "portaldb"
env:
- name: MYSQL_HOST
value: "portaldb.{{ .Values.nsPrefix }}-portal"
- name: MYSQL_ROOT_PASSWORD
- value: password
+ value: Aa123456
volumeMounts:
- mountPath: /etc/localtime
name: localtime
diff --git a/kubernetes/portal/values.yaml b/kubernetes/portal/values.yaml
index 757995ab63..eadc834599 100644
--- a/kubernetes/portal/values.yaml
+++ b/kubernetes/portal/values.yaml
@@ -3,10 +3,10 @@ pullPolicy: Always
nodePortPrefix: 302
image:
readiness: oomk8s/readiness-check:1.0.0
- portalapps: nexus3.onap.org:10001/openecomp/portal-apps:1.1-STAGING-latest
- portaldb: nexus3.onap.org:10001/openecomp/portal-db:1.1-STAGING-latest
+ portalapps: nexus3.onap.org:10001/openecomp/portal-apps:1.3-STAGING-latest
+ portaldb: nexus3.onap.org:10001/openecomp/portal-db:1.3-STAGING-latest
mariadbClient: oomk8s/mariadb-client-init:1.0.0
- portalwms: nexus3.onap.org:10001/openecomp/portal-wms:1.1-STAGING-latest
+ portalwms: nexus3.onap.org:10001/openecomp/portal-wms:1.3-STAGING-latest
ubuntuInit: oomk8s/ubuntu-init:1.0.0
ubuntuDesktop: dorowu/ubuntu-desktop-lxde-vnc
filebeat: docker.elastic.co/beats/filebeat:5.5.0