From 1d12388430a6112d86200fdabba1f156d6bf2ef6 Mon Sep 17 00:00:00 2001
From: Mandeep Khinda <mandeep.khinda@amdocs.com>
Date: Tue, 27 Mar 2018 01:26:59 +0000
Subject: Standardizing ONAP Portal

-synched up with Beijing (master)
-pods come up without cassandra music:
sed: couldn't edit /docker-entrypoint-initdb.d/\
zzz_portal.cql: not a regular file

ONAPPORTAL webapp in tomcat is failing to star
resulting in HTTP 404 robot health

Not sure how logging works in beijing so removed
some of the ubuntu-init dir creation.  need someone
familiar with logging to investigate

-addressed some CI comments.
-removing configmap now that portaldb was fixed

Issue-ID: OOM-746

Change-Id: I123d1ec6889db40b1721475a43665ef8efefc057
Signed-off-by: Mandeep Khinda <mandeep.khinda@amdocs.com>
---
 kubernetes/portal/values.yaml | 27 ++++++++-------------------
 1 file changed, 8 insertions(+), 19 deletions(-)

(limited to 'kubernetes/portal/values.yaml')

diff --git a/kubernetes/portal/values.yaml b/kubernetes/portal/values.yaml
index 89c2dbcd96..5ec23e10d1 100644
--- a/kubernetes/portal/values.yaml
+++ b/kubernetes/portal/values.yaml
@@ -12,25 +12,14 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-nsPrefix: onap
-pullPolicy: Always
-nodePortPrefix: 302
-portalAppsReplicas: 1
-portalDbReplicas: 1
-vncPortalReplicas: 1
-portalWidgetsReplicas: 1
-dataRootDir: /dockerdata-nfs
-image:
-  readiness: oomk8s/readiness-check:1.1.0
-  portalapps: nexus3.onap.org:10001/onap/portal-apps:v1.3.0
-  portaldb: nexus3.onap.org:10001/onap/portal-db:v1.3.0
-  mariadbClient: oomk8s/mariadb-client-init:1.0.0
-  portalwms: nexus3.onap.org:10001/onap/portal-wms:v1.3.0
-  ubuntuDesktop: dorowu/ubuntu-desktop-lxde-vnc
-  filebeat: docker.elastic.co/beats/filebeat:5.5.0
-  ubuntuInit: oomk8s/ubuntu-init:1.0.0
-onapPortal:
-  webappsDir: "/opt/apache-tomcat-8.0.37/webapps"
+global:
+  env:
+    tomcatDir: "/opt/apache-tomcat-8.0.37"
 config:
   logstashServiceName: log-ls
   logstashPort: 5044
+
+portal-mariadb:
+  nameOverride: portal-db
+  service:
+    name: portal-db
\ No newline at end of file
-- 
cgit 1.2.3-korg