Run all components in one namespace

Change-Id: I5fcd4d577c1fda4de27842807c7cf7a5d372756e
Issue-ID: OOM-722
Signed-off-by: BorislavG <Borislav.Glozman@amdocs.com>
diff --git a/kubernetes/mso/templates/mso-deployment.yaml b/kubernetes/mso/templates/mso-deployment.yaml
index b414640..2e5497c 100644
--- a/kubernetes/mso/templates/mso-deployment.yaml
+++ b/kubernetes/mso/templates/mso-deployment.yaml
@@ -3,7 +3,7 @@
 kind: Deployment
 metadata:
   name: mso
-  namespace: "{{ .Values.nsPrefix }}-mso"
+  namespace: "{{ .Values.nsPrefix }}"
 spec:
   replicas: {{ .Values.msoReplicas }}
   selector:
@@ -20,7 +20,7 @@
         - /root/ready.py
         args:
         - --container-name
-        - mariadb
+        - mso-mariadb
         env:
         - name: NAMESPACE
           valueFrom:
@@ -45,6 +45,9 @@
         - mountPath: /tmp/start-jboss-server.sh
           name: mso-docker-files
           subPath: start-jboss-server.sh
+        - mountPath: /opt/jboss/standalone/configuration/standalone-full-ha-mso.xml
+          name: mso-jboss-config
+          subPath: standalone-full-ha-mso.xml
         - mountPath: /var/log/onap
           name: mso-logs
         - mountPath: /var/berks-cookbooks/mso-config/files/default/mso-po-adapter-config/logback.network.xml
@@ -139,6 +142,9 @@
             - key: start-jboss-server.sh
               path: start-jboss-server.sh
               mode: 0755
+        - name: mso-jboss-config
+          configMap:
+            name: mso-jboss-configmap
       imagePullSecrets:
       - name: "{{ .Values.nsPrefix }}-docker-registry-key"
 #{{ end }}