Fix SO Healthcheck

[oom.git] / kubernetes / so / templates / deployment.yaml

diff --git a/kubernetes/so/templates/deployment.yaml b/kubernetes/so/templates/deployment.yaml
index 67718ad..67630d2 100644 (file)
--- a/kubernetes/so/templates/deployment.yaml
+++ b/kubernetes/so/templates/deployment.yaml
@@ -1,3 +1,17 @@
+# Copyright © 2017 Amdocs, Bell Canada
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#       http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
 apiVersion: extensions/v1beta1
 kind: Deployment
 metadata:
@@ -35,7 +49,7 @@ spec:
         - name: {{ .Chart.Name }}
           command:
           - /tmp/start-jboss-server.sh
-          image: "{{ .Values.global.repository | default .Values.repository }}/{{ .Values.image }}"
+          image: "{{ .Values.repository | default .Values.global.repository }}/{{ .Values.image }}"
           imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
           ports:
           - containerPort: {{ .Values.service.internalPort }}
@@ -72,6 +86,15 @@ spec:
           - mountPath: /opt/jboss/standalone/configuration/standalone-full-ha-mso.xml
             name: so-config
             subPath: standalone-full-ha-mso.xml
+          - mountPath: /etc/mso/config.d/topology.properties
+            name: so-config
+            subPath: topology.properties
+          - mountPath: /etc/mso/config.d/mso.workflow-message-adapter.properties
+            name: so-config
+            subPath: mso.workflow-message-adapter.properties
+          - mountPath: /etc/mso/config.d/mso.bpmn.urn.properties
+            name: so-config
+            subPath: mso.bpmn.urn.properties
 
           - mountPath: /var/log/onap
             name: so-logs
@@ -162,6 +185,15 @@ spec:
             - key: standalone-full-ha-mso.xml
               path: standalone-full-ha-mso.xml
               mode: 0644
+            - key: topology.properties
+              path: topology.properties
+              mode: 0644
+            - key: mso.workflow-message-adapter.properties
+              path: mso.workflow-message-adapter.properties
+              mode: 0644
+            - key: mso.bpmn.urn.properties
+              path: mso.bpmn.urn.properties
+              mode: 0644
         - name: so-logs
           emptyDir: {}
         - name: so-data-filebeat
@@ -174,4 +206,5 @@ spec:
               path: start-jboss-server.sh
               mode: 0755
       imagePullSecrets:
-      - name: "{{ include "common.name" . }}-docker-registry-key"
\ No newline at end of file
+      - name: "{{ include "common.namespace" . }}-docker-registry-key"
+