fixing failed SDC FE and BE startup

- a new sdcfe/be image was failing because of a file conflict with
the keystore file that was mounted into the pods.  fix was to remove
mount and let chef do its thing inside the pods

Issue-ID: OOM-259

Change-Id: Ib7937da71adf0a20c90d6efca71ccfb7c550f42d
Signed-off-by: Mandeep Khinda <mandeep.khinda@amdocs.com>

diff --git a/kubernetes/config/docker/init/src/config/sdc/jetty/keystore b/kubernetes/config/docker/init/src/config/sdc/jetty/keystore
deleted file mode 100755 (executable)
index 08f6cda..0000000
Binary files a/kubernetes/config/docker/init/src/config/sdc/jetty/keystore and /dev/null differ

diff --git a/kubernetes/sdc/templates/sdc-be.yaml b/kubernetes/sdc/templates/sdc-be.yaml
index 38a239e..d853f18 100644 (file)
--- a/kubernetes/sdc/templates/sdc-be.yaml
+++ b/kubernetes/sdc/templates/sdc-be.yaml
@@ -79,8 +79,6 @@ spec:
           name: sdc-sdc-es-es
         - mountPath: /root/chef-solo/environments/
           name: sdc-environments
-        - mountPath: /var/lib/jetty/etc/keystore
-          name: sdc-jetty-keystore
         - mountPath: /etc/localtime
           name: sdc-localtime
         - mountPath: /var/lib/jetty/logs
@@ -100,9 +98,6 @@ spec:
         - name: sdc-environments
           hostPath:
             path: /dockerdata-nfs/{{ .Values.nsPrefix }}/sdc/environments
-        - name: sdc-jetty-keystore
-          hostPath:
-            path: /dockerdata-nfs/{{ .Values.nsPrefix }}/sdc/jetty/keystore
         - name: sdc-localtime
           hostPath:
             path:  /etc/localtime

diff --git a/kubernetes/sdc/templates/sdc-fe.yaml b/kubernetes/sdc/templates/sdc-fe.yaml
index 53759dc..915d18b 100644 (file)
--- a/kubernetes/sdc/templates/sdc-fe.yaml
+++ b/kubernetes/sdc/templates/sdc-fe.yaml
@@ -63,8 +63,6 @@ spec:
           name: sdc-sdc-es-es
         - mountPath: /root/chef-solo/environments/
           name: sdc-environments
-        - mountPath: /var/lib/jetty/etc/keystore
-          name: sdc-jetty-keystore
         - mountPath: /etc/localtime
           name: sdc-localtime
         - mountPath: /var/lib/jetty/logs
@@ -86,9 +84,6 @@ spec:
         - name: sdc-environments
           hostPath:
             path: /dockerdata-nfs/{{ .Values.nsPrefix }}/sdc/environments
-        - name: sdc-jetty-keystore
-          hostPath:
-            path: /dockerdata-nfs/{{ .Values.nsPrefix }}/sdc/jetty/keystore
         - name: sdc-localtime
           hostPath:
             path:  /etc/localtime