Fixed incorrect APP url to access CLI

Fixed incorrect APP url to access CLI by clicking CLI icon in portal

Change-Id: I188d7e426b5775f7225b346264b9c9b8c4762d08
Issue-ID: OOM-600
Signed-off-by: EC2 Default User <xiaobo.chen@tieto.com>

diff --git a/kubernetes/config/docker/init/src/config/portal/mariadb/oom_updates.sql b/kubernetes/config/docker/init/src/config/portal/mariadb/oom_updates.sql
index 3c7206c..781b046 100644 (file)
--- a/kubernetes/config/docker/init/src/config/portal/mariadb/oom_updates.sql
+++ b/kubernetes/config/docker/init/src/config/portal/mariadb/oom_updates.sql
@@ -5,3 +5,4 @@ Any updates required by OOM to the portaldb are made here.
 while the OOM K8s version has these service split up.
 */
 UPDATE fn_app SET app_rest_endpoint = 'http://sdc.api.be.simpledemo.onap.org:8080/api/v2' where app_name = 'SDC';
+UPDATE fn_app SET app_url = 'http://cli.api.simpledemo.onap.org:8080', app_type = 1 where app_name='CLI';

diff --git a/kubernetes/config/values.yaml b/kubernetes/config/values.yaml
index c26e804..e694641 100644 (file)
--- a/kubernetes/config/values.yaml
+++ b/kubernetes/config/values.yaml
@@ -3,5 +3,5 @@ nsPrefix: onap
 dockerSharePath: /dockerdata-nfs
 image:
   repository: oomk8s/config-init
-  tag: 1.1.10
+  tag: 1.1.11
   pullPolicy: Always

diff --git a/kubernetes/portal/templates/portal-vnc-dep.yaml b/kubernetes/portal/templates/portal-vnc-dep.yaml
index 005148a..d81a64e 100644 (file)
--- a/kubernetes/portal/templates/portal-vnc-dep.yaml
+++ b/kubernetes/portal/templates/portal-vnc-dep.yaml
@@ -103,7 +103,7 @@ spec:
           },
           {
               "command": ["/bin/sh","-c"],
-              "args": ["echo `host sdc-be.{{ .Values.nsPrefix }}-sdc | awk ''{print$4}''` sdc.api.be.simpledemo.onap.org  >> /ubuntu-init/hosts; echo `host portalapps.{{ .Values.nsPrefix }}-portal | awk ''{print$4}''` portal.api.simpledemo.onap.org  >> /ubuntu-init/hosts; echo `host pap.{{ .Values.nsPrefix }}-policy | awk ''{print$4}''` policy.api.simpledemo.onap.org  >> /ubuntu-init/hosts; echo `host sdc-fe.{{ .Values.nsPrefix }}-sdc | awk ''{print$4}''` sdc.api.simpledemo.onap.org  >> /ubuntu-init/hosts; echo `host vid-server.{{ .Values.nsPrefix }}-vid | awk ''{print$4}''` vid.api.simpledemo.onap.org >> /ubuntu-init/hosts; echo `host sparky-be.{{ .Values.nsPrefix }}-aai | awk ''{print$4}''` aai.api.simpledemo.onap.org  >> /ubuntu-init/hosts"],
+              "args": ["echo `host sdc-be.{{ .Values.nsPrefix }}-sdc | awk ''{print$4}''` sdc.api.be.simpledemo.onap.org  >> /ubuntu-init/hosts; echo `host portalapps.{{ .Values.nsPrefix }}-portal | awk ''{print$4}''` portal.api.simpledemo.onap.org  >> /ubuntu-init/hosts; echo `host pap.{{ .Values.nsPrefix }}-policy | awk ''{print$4}''` policy.api.simpledemo.onap.org  >> /ubuntu-init/hosts; echo `host sdc-fe.{{ .Values.nsPrefix }}-sdc | awk ''{print$4}''` sdc.api.simpledemo.onap.org  >> /ubuntu-init/hosts; echo `host vid-server.{{ .Values.nsPrefix }}-vid | awk ''{print$4}''` vid.api.simpledemo.onap.org >> /ubuntu-init/hosts; echo `host sparky-be.{{ .Values.nsPrefix }}-aai | awk ''{print$4}''` aai.api.simpledemo.onap.org  >> /ubuntu-init/hosts; echo `host cli.{{ .Values.nsPrefix }}-cli | awk ''{print$4}''` cli.api.simpledemo.onap.org  >> /ubuntu-init/hosts"],
               "image": "{{ .Values.image.ubuntuInit }}",
               "imagePullPolicy": "{{ .Values.pullPolicy }}",
               "name": "vnc-init-hosts",
@@ -150,4 +150,4 @@ spec:
             name: vnc-profiles-ini
       imagePullSecrets:
       - name: "{{ .Values.nsPrefix }}-docker-registry-key"
-#{{ end }}
\ No newline at end of file
+#{{ end }}