From e23a337230cff9beb2d5dc3781ca64bc87f7fae6 Mon Sep 17 00:00:00 2001 From: Ramesh Parthasarathy Date: Sat, 15 Feb 2020 20:46:59 +0000 Subject: [PATCH] Added AAF SSL certs related changes Removed client certs from the docker image. These client certs will be mounted on the docker image using helm charts. This will allow helm users to manage AAF credentials using the keyfile available in SO OOM for CADI AAF feature. Issue-ID: SO-2451 Signed-off-by: Ramesh Parthasarathy(rp6768) Change-Id: I03efc6ad279f0eaf6773b0ddd42ab43fc053e424 --- .../src/main/docker/docker-files/Dockerfile.so-app | 1 - .../main/docker/docker-files/certs/org.onap.so.jks | Bin 3582 -> 0 bytes .../docker/docker-files/certs/org.onap.so.keyfile | 27 --------------------- .../docker-files/certs/org.onap.so.trust.jks | Bin 1413 -> 0 bytes 4 files changed, 28 deletions(-) delete mode 100644 packages/docker/src/main/docker/docker-files/certs/org.onap.so.jks delete mode 100644 packages/docker/src/main/docker/docker-files/certs/org.onap.so.keyfile delete mode 100644 packages/docker/src/main/docker/docker-files/certs/org.onap.so.trust.jks diff --git a/packages/docker/src/main/docker/docker-files/Dockerfile.so-app b/packages/docker/src/main/docker/docker-files/Dockerfile.so-app index 90f0a6627d..e8f02f12c6 100644 --- a/packages/docker/src/main/docker/docker-files/Dockerfile.so-app +++ b/packages/docker/src/main/docker/docker-files/Dockerfile.so-app @@ -14,7 +14,6 @@ COPY configs/logging/logback-spring.xml /app COPY scripts/start-app.sh /app COPY scripts/wait-for.sh /app COPY ca-certificates/onap-ca.crt /app/ca-certificates/onap-ca.crt -COPY certs/* /app/ RUN chown -R so:so /app && chmod 700 /app/*.sh diff --git a/packages/docker/src/main/docker/docker-files/certs/org.onap.so.jks b/packages/docker/src/main/docker/docker-files/certs/org.onap.so.jks deleted file mode 100644 index 1e849afb5e024df304f5c582d5f4bde8833d2490..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3582 zcmb`IcT`hZyT)@;=)HpoNCzdJ1R)d!0x=ZnF@RDd0#XAZN>N4<5GBAsKy(o4T|h*K zCJe=KXbOT1y(nFgB7)KsE{u20b-sJ=y6ao({;}6N&p!K{^X~n=&+pw`+FgP`Akh5* z{55!j$p*n>BsqW-h$K_I_NN2lj61JDAP6`}M?gRx7LKDV031+-@&f<@0;j_ljn};5 zhLdn*+R`a@&*lTfc^u!9PDbMFSu29%L*1y7;W1QtTJQ;&NKLeZVVwM{9m`iV3tU|b z#l)DEeZDQ~V?jsMSllH8bxC=5;XB&q^DPVwrM)&~E<$q-`X}3X$@B5gf-FX@suYx` zFX!qRvVMuC4hE?HdZtbX$*IosyLhNf)UO(a)V|T`$Os{$OS@9q`W<{!JzW2KVlHlK z;%349j;g5aNCtbN?kSPTy5mmm#a})*+NKwgcU)#2ypJWa+z50M?(Om25(ii@)P`T~ z`8YH_Pz&Yfad!<5-g#pDd)icN#qC`A@ynDDc6a%w0m~~^+uJn-yFJ;0d{j~Xs<>!3 zhw)c!6mIIe2zxEJgyI(=Vijjcq1y%^(ZVTw?RFvI)X)(3>>Dyjv6u6|UQdiVE2I%7 zpcfpIyHK418__gpcw{|xTjUjMmH1`Q!hn95Am&XJX^2q`YfkZ4IWoU#CA6`ppI)l& z!0{m}a<1?4a{=eArU1&h<>Ja=304?NJ-WZJJR3PPn*Gzqd}BIrfmP?{?zj-CQP@NB%Rn(%Ix`ifuKPfqa{4!yXx^9> z%O>61*Ydih+n)`L8J{o&DFHA4eELaxc--mi+)uB+Dj=0Z*UW7y(}w)*nvbp*Uv;!; z#~5eWWzpV!DlpMJ{IfK9A#uiqsuy9{TXm`tY(yd={&>K+DeB zW?IRKlbSoIm9B+jdupDNxVA?)Qd7n$SApfcHKrfL?_Gu42idxSoAG#7dtlV3MPRs# z!GD%X(7xK(si9(yPPKrE?Cv@&@*xE_N*U8(hQ4vuzK8CisO2dMD{jcx=jI}ghXb8^ z@|sR_8A{ZL%~Fh~YspVW1Yumuycla2iPkM@{XYAlPwMw2MPCv&{s&hQF? zJiG%}UcbaRl5@5)r*L*iHlC!gNQrMhM<--5A6MXv3Anl@8w-;mS(+Awt9h*}^3QWj z$?Tubuq~vD1X@ASoF=kaL& zJJWJ*{cQBmbN!2#_>%e=#Z9u(F%M-Bn#Mlk7v{A5;<*WUa|fex<{^bCEmMZvNPFXI zsovfCIsX0-zq6H*niOmp<@N2^w-@VVA=Yinhf?HW)tx-H6*Ma2ZLRb;7SUgG`6g|)| zES2U+)dr-S!5<_@OF#*LeBa+@4<@U* z`+0i=P*F(m*xv!M10vG?B#JNcBGR7}K=SgS7zBEd1N}UZAJo3B?PO*ffN4A=UvTsQA;B|CLOO9{+amp3D9u1_sr*v**e%qw~is{tq zzL0Rv*Vv(DJIft4RjwR*|5ogg>ykxl?*n1;WAjz(tHeu-3X?)ZPCi(VggxsOlN<6Y zpI5id)N*D=P!0aYxG{gh7Iu8X*N4*gk*3(?Rr3umnX5KgY>)f7uMC)1O7RUGkFhe< zNksn^D%n$=I{s0{5g%wzx39{<*k<%qz97zQ^b?0X(-AOM`vx_&u2NDh%!M_+DuoDnz;g#i#CkM;tjwf|KhhXvtK@Sw@U zh=+LrU=I$5K@o33nFFnGphZ9-7PkEcj6kr$fWPmc;Ms!}a&QaqOr#KPBh8Vou04KY z&DLeX(mUHouWURA%-=79eqzBMZvovkTls6E+uohG*;NSdP8ZjRLL+ruxPXh6tvA&<1l(KMi4UrrgB8>ZrdNK9hl4#lKTgI1l`Ia1f~t)nKmF$SjxxL zmSvbT4#}bTqs#X#IR$3OpSc*3T)GbpiB0o6^o0^n;-~jx&B?R6&V~aN4(*u^@jEY+ zZ<)Ppz?*tcoOdYgbr01oF&Qx`;~Biq1DNq6$l+mg=g3FhvO3WI&6J&4sp%o!YW6D7 zwevQoN>B6Fe;PRkq(%MUn*Yg(p!9dEih&}LLIk4vr!yaVY${tq@3knSuC6RBnSufb z3j`0`&IYpVU!VZ+Pa*&@-~XZTzvAGZMFpcn0SK=k<(^DJg;&k8Y;Sl>rK%_SSv)mJ zD*-6pi7o2w_G8OQ=yzJ-i<2@Tb%qM(>qa=ccV;!Gh#92LN zW?TCvV9l0jpvk#2Tc1{MV|(VvnbX`!c0SksH1ig$q_-8ya0^2-hF^^l&fg6__Ey0L zC+zfCau~4~r?>q}>v|Wd1?bMveqLvxF}6E6K$=LIvFG13b!4r#ZS{f|p1)Yw4bDkX>)Pew6o_BGiR?Soinl*D(crSqyjCA&eK(nj zS31J#!tlL4)F3Ryw%Hr(hk5Gjg~;PJ#kd+M4TRw>Jr}za4Zb8zipnN~AwKj)Kql7G z-!gyF_&PtwE#X>ZXNXPr_0vt~G-_T{aNO|_)D4)ex*C#?ELoz}p=)z*nS`e*F6#dl zG&`Vv!O!f}W_r@v9~QN&ic3Ct+gnoX<+)HoAH`@m{CIpz7FeCWYNe=f(V&6bZ>Zn8 zdSkX4bNBd73zs2_p1W2egXrz?ky2W(_&71In;{l=vxLQ6)N&i?IO);30q&Uz2CY#8 vWZG*?>C8++tiv0zCL{AXwJ<5t@9&H5HKxrWMQ>f%nn?rJwhg*<+wyisyUqJeCWgZaz6Z?_j%vn`~05Yhxb*?DrP|-5M+J8|DeiQ zrguQ#S!RGYur9F^VS-K&+#XSQC-bM zvv)j6XFbN`T(CpC8hGfO5`SHZEUV$y+0m(r@D(fai-blmR{kssYE|i&1GX7gnbVxh zo>%RO!<}C-=Fhb|@LL)hSV0=2ZVm&nMjjKF)kEa~3C{WC(tCZvN`13y+PEybx)h@06jY~hV6 zBh6WH!9_l+8ShhIP5$~xBgL6{5v0T33tfF`m~!0dmUdKEt4qSos5Lj-*i>5JV*MkV z>&N2UN}I*uNjKWl*O0#AiC50UqD1}DCss}U_N%)hFVAx_!mJIMH!ZUyTgsj2`*lnl zRz>}7w{|U1e_vALxwrG`!t^G5YDqEQi!@xMHunz%RF9MnGhRDE{Tzl!j75MV1z*jZ)17t5) zGpaX<5{zQ1m8<_I%CthCkG33{$1>c5^2Y?p&9$~3T7Wd8Xz73m-$QfQw0g>48WPT; z%f)*;Co}En1$|MLXR5D1C^j5EXADTZ#Ls%;4}Y6X$ajpr_2DoAo7e=%Q~$7(Z6@Qj zlRs9X4hl1oqn7Aa!sdrVt;{gDFHy>G2R!}np3s0m!60z)S%3-Xu18Q80YkyIy3&b@ zv>BO;s6F&{JB|=B|9C!@EQybK-U34YzW8=0k&Qc-j6X{ zZ^e2H!61rWH>)zVz_E&=?a#DmF*)AdwdsPwwu&?!$2KJHl`iEBL32WsF0E>)P!Q=l zg4k$Um$xKcn~`uaN0h;(?(xiOom*944I1^?tmZjNp7Z5rL#B&YK2~-V&i3(X62I(E z4}sL&u>Ngib5GrG(U(rPW83)Ov!36F34*SUZ@(IvbSLkD4YT;GeQ$qNo0m;lVZNtk zM&GWAn0Ho^4pVt`&}D8-V?9~_X`(#Ei2K?(S%VTPC@5K!z6gz&zSy0Du6QX-;D?Bx z>#ZCH)N-GUnz;P}W0^8wRH+^JzC;^Wxz zM9j7~ToaFR7+e&>W*%yDO-nW7Wwi>CC3r`8)M7TOV$FS&9p^n#AKb`ka`Q8{$EA8M>WO7y;FX2ABx41lDlOF z49&q7f9e~S09>}xJ2gV7ZQK1tN)xMi5-d;i8=@L$kVX|gSe@d&N1{_g1Q|fQGq6|8&k6(20J?YQ2 zl1@>gzn@8BSZw)(j#SWuQW4kicxo|8f_Xd|aSiznwLS7JfByN)^BApQ9$rpcw#2dz R?169Ea?jozi}@38^Ec4gUZVg2 -- 2.16.6