From e4fa91b5fc6f3cf77a0a7faf2abe5b472386c369 Mon Sep 17 00:00:00 2001
From: Mandeep Khinda <mandeep.khinda@amdocs.com>
Date: Fri, 1 Sep 2017 19:37:24 +0000
Subject: [PATCH] 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>
---
 .../config/docker/init/src/config/sdc/jetty/keystore     | Bin 1416 -> 0 bytes
 kubernetes/sdc/templates/sdc-be.yaml                     |   5 -----
 kubernetes/sdc/templates/sdc-fe.yaml                     |   5 -----
 3 files changed, 10 deletions(-)
 delete mode 100755 kubernetes/config/docker/init/src/config/sdc/jetty/keystore

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
index 08f6cda8a7b0104236c37f3c06b4cda1d8fc58e6..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1416
zcmezO_TO6u1_mY|W&~r_tkjZ{N+3_R)U<s8P-d4w6Vo;WJ~l3GHbxdkEha%mMpg!v
zCZ<JS>ekNZbhDKH`EXUR-=<HW+b@=WiLu$;!0OFh;K}!<hI_@9j#VG~3vOMOa$BG*
zZlCf?LfLTtET`r3!&iG=F*@NOwqRq7glryPEYnrJ-V>hO7hY&y{H-e(+TowuJ*{`?
zwVfT`ns@KmCLd9_H?QZ%#(VNFq-*~l&ib%)(Y!;gI{W`RJIFow^~EB{E~hHzXm8Qd
z$+I3OFWL4l%D`0pEH}^DdFqAf_3vNy-<sym@!#O3o%j3?98YcU1cuL+DC6pNE@C?+
zy5dIb{0%B6-(T>07jRmW@8^t|?HpH{w+9zJZ0HTQ{GwgE`KsL0)*BinM>ExK{8V|s
z_c83?=Ue&W%>UG?wT~>g^C-D5b6Kid$utMyOUY~8&RQ2O5Kv$6WA72RZCZOI`%XW7
zWGv*iET~D-A?Uf$)PkAXC#^&coOKW1)_<D0r(hxTmH$jX+%)tg5;>jbSp1ybc*-Pg
z*1AKX?hJ-g?<}Z|$~fj~%&Q)8GVXHmuY_w7iL*9Li<#ba=>(4shvkf&zalFllP<se
z-Rq#U@=~Rv$hrlOg7m(mOb-1ddX9-_QEndp<OU6?kozrL8Sg}&Yl_^=I_=%Rn5R|y
zU+CRxy{;Q?`fruU*&jBVCztJb>fRmB({Gr>G+(AG{|j5^yi-$J^G%gy&!3%F`Y=?Z
zqHag3(zm<4?6(-6S8caBa7ykAzsvLfb>|ds{`&FW?ULoW&INs`nHskiv_4^yUS(;u
zwJG}=M=euvt`d*!{pAW3tsAR<Pcm4Ple{SRW8dm>0lWEH+#d4(r%9_{jEh_BIde_H
z2F(udYbrB!9Sz@xPFu0!#>2SI`Ssat!p3^(;?40Uy|?vOtS!3O8Zd1|F}L60tKCOm
znylYEA@-w}ri%BqU%N_+XGl&zI@4*vv5nXG(`N27=6zy$WG5s+N9dUvSOODr2QVSG
z7&I}yWn%FZKK#XimyJ`a&7<u*FC!xhD}zB}hoJy4nKOs7unDt==4I#Qm*>GmI50%m
z5h5xEN+4Za!qUF^MI{POiIob@`FX{qIVG8S=?VcQl?py3DTaIoJRnuv!mM7P3}z^0
zAOYet3k!lXoL(+aZ&G5VUVc%!ft)z6frX)=fw_T+k%h5YlsK=knSrs9DU>^yoZ2`a
zIUIo{19M|9Ff2Qn8XFm!A3o&OeJrUOYjfQ^)giy{^|QK1CEP2QH%vD1Nc3MB^xmW4
z2fxzex2hhF*O)r=%WpirQ+H{vy7qk+o=56U7bdiMykRRo{_oVH)z<U+ZSVQ*TDtwS
zgXg7vKYFGc2Va=8>DhW2yL+!vyn`wiA33|lR42Pgou}g~dvauF+U45K+=Wccj0}v(
z&I3j>GtgZkrPhJg=H9<%l_$GC*-}{lrfI>Hv$DOvyPj6+9TS$eJZ37ao71_#A!EVD
zCY$?z=d9ULtT&}=o8QIxpMTDAp0ptI@ccyM2W9WgVozM<*}KLmGg5<ZMbYY>O$WNJ
zyVS~6#D7};!ib^4U#WeU%`4Hj5}6$f=N+nWnZl~&!Rl~+N3e<Io1+(7cFa-duC*&L
L)G(B?(|Qd6fhtB8

diff --git a/kubernetes/sdc/templates/sdc-be.yaml b/kubernetes/sdc/templates/sdc-be.yaml
index 38a239e714..d853f18f91 100644
--- 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 53759dc685..915d18b786 100644
--- 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
-- 
2.16.6