From e94258e3be0da3a15680de53b1817490c4173759 Mon Sep 17 00:00:00 2001
From: Munir Ahmad <munir.ahmad@bell.ca>
Date: Thu, 17 Aug 2017 12:04:14 -0400
Subject: Revert 0b1332938385cc534b1f034b73f19c145ead87c6

Issue-ID: OOM-66
This reverts commit 0b1332938385cc534b1f034b73f19c145ead87c6.

Change-Id: I05ba7dd5050ee2ef03cf19d1c5c0db03e12a0d4f
Signed-off-by: Munir Ahmad <munir.ahmad@bell.ca>
---
 kubernetes/mso/db-deployment.yaml  | 7 +------
 kubernetes/mso/mso-deployment.yaml | 6 +++---
 2 files changed, 4 insertions(+), 9 deletions(-)

(limited to 'kubernetes/mso')

diff --git a/kubernetes/mso/db-deployment.yaml b/kubernetes/mso/db-deployment.yaml
index ff39c5b155..f57f4bac87 100644
--- a/kubernetes/mso/db-deployment.yaml
+++ b/kubernetes/mso/db-deployment.yaml
@@ -28,8 +28,6 @@ spec:
         volumeMounts:
         - mountPath: /etc/mysql/conf.d
           name: mso-mariadb-conf
-        - mountPath: /var/lib/mysql
-          name: mso-mariadb-mysql
         - mountPath: /docker-entrypoint-initdb.d
           name: mso-mariadb-docker-entrypoint-initdb
         ports:
@@ -43,10 +41,7 @@ spec:
       volumes:
         - name: mso-mariadb-conf
           hostPath:
-            path: /dockerdata/onapdemo/mso/mariadb/conf.d
-        - name: mso-mariadb-mysql
-          hostPath:
-            path: /dockerdata/onapdemo/mso/mariadb/mysql
+            path: /dockerdata-nfs/onapdemo/mso/mariadb/conf.d
         - name: mso-mariadb-docker-entrypoint-initdb
           hostPath:
             path: /dockerdata-nfs/onapdemo/mso/mariadb/docker-entrypoint-initdb.d
diff --git a/kubernetes/mso/mso-deployment.yaml b/kubernetes/mso/mso-deployment.yaml
index 56daa61aa4..fb052df734 100644
--- a/kubernetes/mso/mso-deployment.yaml
+++ b/kubernetes/mso/mso-deployment.yaml
@@ -42,7 +42,7 @@ spec:
       containers:
       - command:
         - /docker-files/scripts/start-jboss-server.sh
-        image: nexus3.onap.org:10001/openecomp/mso:1.1-STAGING-latest
+        image: nexus3.onap.org:10001/openecomp/mso:1.0-STAGING-latest
         name: mso
         volumeMounts:
         - mountPath: /shared
@@ -66,9 +66,9 @@ spec:
       volumes:
         - name: mso
           hostPath:
-            path: /dockerdata/onapdemo/mso/mso
+            path: /dockerdata-nfs/onapdemo/mso/mso
         - name: mso-docker-files
           hostPath:
-            path: /dockerdata/onapdemo/mso/docker-files
+            path: /dockerdata-nfs/onapdemo/mso/docker-files
       imagePullSecrets:
       - name: onap-docker-registry-key
-- 
cgit 1.2.3-korg