From 13c7907b9795549d4199accc574d65ffdd630a71 Mon Sep 17 00:00:00 2001 From: Dusan Rozman Date: Mon, 21 Aug 2017 14:11:40 -0400 Subject: [PATCH] Updated deployment yamls and config to SDC v1.1 Changed the yamls to pull the v1.1 image and updated config files for dockerdata Issue-ID: OOM-67 Change-Id: I2c51486a610f3187e200e5e08c59b132a5d7ffb5 Signed-off-by: Dusan Rozman --- .../config/docker/init/src/config/sdc/jetty/keystore | Bin 3697 -> 1416 bytes .../src/config/sdc/sdc-fe/FE_2_setup_configuration.rb | 16 +++++++++++++++- kubernetes/sdc/sdc-be.yaml | 2 +- kubernetes/sdc/sdc-cs.yaml | 2 +- kubernetes/sdc/sdc-es.yaml | 2 +- kubernetes/sdc/sdc-fe.yaml | 2 +- kubernetes/sdc/sdc-kb.yaml | 2 +- 7 files changed, 20 insertions(+), 6 deletions(-) diff --git a/kubernetes/config/docker/init/src/config/sdc/jetty/keystore b/kubernetes/config/docker/init/src/config/sdc/jetty/keystore index d6592f95ee93575d659f28e1c2ebb81191484986..08f6cda8a7b0104236c37f3c06b4cda1d8fc58e6 100755 GIT binary patch delta 1225 zcmew;)4?tO@9n?03=9lRK+FintXZigC6z#)Y^iDcg313lWa_`vt)0*5W-0yi;i_Q2 zO`kruUo8C+W3#(~)tkA%lkZIp_lhkYt3LJ@+`25~wm@0jKINB$vf=(&PRr+qulBrR zbizSw!NwQ~**v~jrmK3rCp@_?ywJS(TURi&!#}rsTJO?pJ3GEL@7}RZKB91MUeAw> z_vBwl*Zx18^i7S3c947U>x)H@T~1Zb(cYq^lV?3nUb5|9l!2-GS#F-Q z^VAE|>)*fZzctOBTb5FrS<}3f1ez(U7x9gcd-89RSPRzxOUe)qfAL1*QqN=K1(3mygO zeMy-d`bqR06VIaDJpRcI8d4$mTedRZi9Xj9xtVp^yMHlHtMTe*m*@TK&MDsf_2a$UCChW23;I$sHEu0veZnNY%F=3UQ}#8ETBhP$B_7-R z%M~hGH&*|iWUweFc~S1izSZRdcJsBkJ>>sSlUBbN7q{4R=9+>HnjPNPRA%Zr8omvk zwqnJNhjE?r>$BU0jrG#So8wJ-Z|kpETXeBCVA_geZok7}SG$kCG+DoSLhMH`O%?BJ zzjl=t&ybvcbf(jSV;isWr_J1F%=^Uh$WBP|jnFeSummRP4udA97K0|nw@fUa!iT>Y z@Un4gwRyCC=VfGMVP!CA?3nzT+gw$}K#7exl!Z%J+Bd(bM8PSsQo%Vtueda)Br`8v zA)usE!KWl;@>W(wy$kn?&DPqq}+ziC=9<*aP)@2;nnddGyNEsvQB>*jPWaL8D&vB~EC-#Ke` z6zfgt+U9q0{^y@_oF^^FJUln^o&74e^z zzc6CZYw%ZU-(~Yk^sPi@$HIAsDqNNvrWFIDxY+1`X7+JztLzb~8nyh1tFhllAM#9*skfo5_gREH|Ye<*} zjioF#A|{kAS+bnz>746yuJeEMe|KKoFTTI)zOU?< z#FyiM0S zgr$YM*b&YG_ zBYG^7qphlg*P^t%*8HVu*QIYChB#Y3%{|xDITzOcS5-xyIyE%==@R8Y2F%EN$6tMG zwQ~+5^ZD_b{g(m9_2BQ0{&XXjG03a(Cfv|JEqWr-i^`OAfZB{rft_(B9hc^H$E)_a zjgLn%qTnla5ZwQM;E?px_@7IR$8USXlh(u`>^GMh9l|HpP569{Uh#aQL+p(OHnqe z)(^mk4f`p1`(oj2Np3=Cw1)BGr;+8tJmlLZNPmq-TqKgs#r8Y1q7IwBBO@4BD*1NS zBDbi)W>k;I3;j$!MM*5gnNFBdvoq0<+V!T{qf(LrAI1dGb`iTaVNLu#EV;tO#x)c^@!-Q)A?S< z?%W8;T{x!36yKF7cVg1G!7S0?Q)zgxTU&-sGxU7Z;ZOz?lFbZ?nlsYypI`VqD#}nm zIY7RC&6o@WaXNPA9~tE`Sxpu6s9ERtoptCD=Q7mnt0vjZ!RyA2LInmLiX&I_U;9XH zzBP&BwK2(XK5`zqsk6U+b?dtUY#q^aYRgiXQ9=`KZ&S;NZtvLkutD1^3!-9lM-F=%E00v__Y1q(j|bzhne1L zzpOFaVm?e=8qekKJ61kqX}x%>OvS44k4H{lWrfBLoUB^#dt2=%@HSr`BsB;*&Buol zvO#Z%BPw-=N-4V?Kguu>t*Z1lx8lEXlpan^K8vpU3>PDBVXzrWZYBKPJD1|kbEI!5 zYOu1mv-LS!NV9!cdC52BhSF4#DCG5@5_yY=6TDK*J)1r#Y|3-sE;Bi|2@XYFJJCR}`0OVC88V)?m`{9}V6z+VXX2E-#W-N8I*qRc$Pm4xc zEZWN{!_)u(a5F3t+yILN<>rAwKoE$I-nu~)#>T)T6>Su~!v+Mh&;pYXrvRZPCfJsa z0m^9Wd&3tO?EA0EiT|oF{<|Up6Z?6J87g3g^A8Z#bqN*L!};C}^bWxKVuURMLgj=_ z1Ki~l*kPPYs50{+-@(Xg6;x{w7)u=Z}F2@~|l=!;}?a3JOZ9 zFeQh-rK*DJKjr^cvyniN-_4|v1{?|Gpdkpz42lE-0a2{d=TvW{yQ{>!rTSsB;34Ob zD#A-j0<+zvdn-Jndahyp+$dkSnL__2i|S&`^EJ}owEt73gtB_}ycu&i3&)=UX38&i zj5HU!Zj-nLWoNmu!AGxnEiBRwrZ}^Vufg?Mle6E6pmEARSN%4Nb3TImCLU7%@)F`; z-qOtqSy>%F_amkLSlj?7VJ?*Rcrf7YE2X^c72W-4qGM*bmh?L@9Cgmq?y`uS>}uA8 z&DT7UE8u-Hpdlz}Z0(0<>%0+(qlLxGmEJd8TULo{H1rSYgip}6)Hx`A%^z zT*#!j^NIrTXS`K0J6kuBZ7i?bz4Nw$MbQOK^AktWS6xY4_&GZfS=M1m!9<^ zCya2V*0d6}XLX?6`t=dS9>WLvlcmw!|0?g{r2A>w%UvB*G@di{tkUm=~ z#6P_nJ(+SQFnJ-nJiT*+QN`PA`C(LB8}XX>T}mci&QNr=D26904C9d7mMuH!lNGd{ zJK;E2-`%uKQ6cW-C}GtV--vzEz%#d|_p%z4#D2Ywa8NBmLuN15bU!Wr;gpbroUi&J zlc@JFY7Z^NhVzxYK}>p^hde~d9I6$4D4y`lsma+h+DX)FJeDRCe0*a*4fwyX>G1=r z7DnO=@g|&_$B=F{66zg^RN70xjAFhSo@C$D5q-~EaM3+nSv99@b(HnB0Ld%XtSw_H zGyKA^Nu48vQVN>b0*axU-<&IvD4LISE zPFNoja@A!c0D19a@6GJEy!;+t7iaO{--#xl&ky0}0K>d55-Oca#3fbux;odo6{y>k zq?h|gqxYPY4f&?l80EVPa&0%z zj&=BPpW|+E>#f3hX|cvFgFXGLmIT4HrtTKA66yt|44xsyzhoh7q>pTH3$S@?p)ZyL z_d*^lF#V{Hx%|qxI}AWftkp#MQqmF(0UNL9RdiSNLe<0tvQa!Fb<`J@ zC+m`2ExT6e=JGHM}J=Q8hY6xoY7?8TI;m8h4&CMMH1K-9+E@8n`5 z=y>l@Lt@zcq#D`gDXZ0>134LP-`2RG=>n|~Tb*5XlipYBS)M7#=-CSH^XbhUcP6hjZT$zBKxwpx zoJ0%C9T1(`<_6{W1fcuLq{M#_=>N$iei+{`CPDuXCMgKR1b>l;2Z=}f3R~j>{oT;Q z`sg6EHxBQE_6<^xDz!Vh~l$4d>a2l3qN`XeHU-Eyh zU&7Ph9sLO=LL$voB8Wf$G;G5^$JI-nK#Z;5O^dLx8}zh&^z}&?HY!!NNsiSBLC)iU z4msl&aksF7TTLrIa~C1Cih7cDy3G1bNRnl_}%xr@88H;K8>^i}vh97R(z zFf691ePm#~wOhcL$(!k5#$bR#YUlEA%I`P-U?ZIlzg%tMKD+JA`8O4QZ;y82U|L_A zoELO&jAkx(YEO-nb4+V_HrQ;aKC@d8GYodSrbwOZFbWedevPhswrtLGQ{?N*rin(+ zbUDXIDrI_w>+QEG^dSq%tv>h%17}n;%Q@1Kx$6}eERle)tkEOs_W{e1t@VHDnEGdv wEFzAHc&(-O`dvH6;mJRF{6sVzs8PZB{SN^zS470bpS=8~^|S diff --git a/kubernetes/config/docker/init/src/config/sdc/sdc-fe/FE_2_setup_configuration.rb b/kubernetes/config/docker/init/src/config/sdc/sdc-fe/FE_2_setup_configuration.rb index 89f94fbf1e..9fc662ee0a 100755 --- a/kubernetes/config/docker/init/src/config/sdc/sdc-fe/FE_2_setup_configuration.rb +++ b/kubernetes/config/docker/init/src/config/sdc/sdc-fe/FE_2_setup_configuration.rb @@ -1,5 +1,6 @@ +jetty_base="/var/lib/jetty" template "catalog-fe-config" do - path "/var/lib/jetty/config/catalog-fe/configuration.yaml" + path "#{jetty_base}/config/catalog-fe/configuration.yaml" source "FE-configuration.yaml.erb" owner "jetty" group "jetty" @@ -11,3 +12,16 @@ template "catalog-fe-config" do :ssl_port => node['BE'][:https_port] }) end + +template "onboarding-fe-config" do + path "#{jetty_base}/config/onboarding-fe/onboarding_configuration.yaml" + source "FE-onboarding-configuration.yaml.erb" + owner "jetty" + group "jetty" + mode "0755" + variables({ + :catalog_ip => node['HOST_IP'], + :catalog_port => node['BE'][:http_port], + :ssl_port => node['BE'][:https_port] +}) +end diff --git a/kubernetes/sdc/sdc-be.yaml b/kubernetes/sdc/sdc-be.yaml index f23db779ab..ac2378cb60 100644 --- a/kubernetes/sdc/sdc-be.yaml +++ b/kubernetes/sdc/sdc-be.yaml @@ -70,7 +70,7 @@ spec: valueFrom: fieldRef: fieldPath: status.podIP - image: nexus3.onap.org:10001/openecomp/sdc-backend:1.0-STAGING-latest + image: nexus3.onap.org:10001/openecomp/sdc-backend:1.1-STAGING-latest name: sdc-be volumeMounts: - mountPath: /usr/share/elasticsearch/data/ diff --git a/kubernetes/sdc/sdc-cs.yaml b/kubernetes/sdc/sdc-cs.yaml index 74874f9c35..081bae459d 100644 --- a/kubernetes/sdc/sdc-cs.yaml +++ b/kubernetes/sdc/sdc-cs.yaml @@ -50,7 +50,7 @@ spec: fieldPath: status.podIP - name: ES_HEAP_SIZE value: "1024M" - image: nexus3.onap.org:10001/openecomp/sdc-cassandra:1.0-STAGING-latest + image: nexus3.onap.org:10001/openecomp/sdc-cassandra:1.1-STAGING-latest name: sdc-cs volumeMounts: - mountPath: /var/lib/cassandra/ diff --git a/kubernetes/sdc/sdc-es.yaml b/kubernetes/sdc/sdc-es.yaml index 5176b93d21..cfb5242141 100644 --- a/kubernetes/sdc/sdc-es.yaml +++ b/kubernetes/sdc/sdc-es.yaml @@ -15,7 +15,7 @@ spec: name: sdc-es spec: containers: - - image: nexus3.onap.org:10001/openecomp/sdc-elasticsearch:1.0-STAGING-latest + - image: nexus3.onap.org:10001/openecomp/sdc-elasticsearch:1.1-STAGING-latest name: sdc-es env: - name: ENVNAME diff --git a/kubernetes/sdc/sdc-fe.yaml b/kubernetes/sdc/sdc-fe.yaml index d984bbedb8..0711aa9dfd 100644 --- a/kubernetes/sdc/sdc-fe.yaml +++ b/kubernetes/sdc/sdc-fe.yaml @@ -55,7 +55,7 @@ spec: valueFrom: fieldRef: fieldPath: status.podIP - image: nexus3.onap.org:10001/openecomp/sdc-frontend:1.0-STAGING-latest + image: nexus3.onap.org:10001/openecomp/sdc-frontend:1.1-STAGING-latest volumeMounts: - mountPath: /usr/share/elasticsearch/data/ name: sdc-sdc-es-es diff --git a/kubernetes/sdc/sdc-kb.yaml b/kubernetes/sdc/sdc-kb.yaml index b79f4ca17b..83483f7af3 100644 --- a/kubernetes/sdc/sdc-kb.yaml +++ b/kubernetes/sdc/sdc-kb.yaml @@ -48,7 +48,7 @@ spec: value: AUTO - name: ELASTICSEARCH_URL value: http://sdc-es:9200 - image: nexus3.onap.org:10001/openecomp/sdc-kibana:1.0-STAGING-latest + image: nexus3.onap.org:10001/openecomp/sdc-kibana:1.1-STAGING-latest name: sdc-kb volumeMounts: - mountPath: /root/chef-solo/environments/ -- 2.16.6