From ab27775a69364a22e19c85f92a0f232e18a99f22 Mon Sep 17 00:00:00 2001 From: zhangzh Date: Fri, 17 Jan 2020 01:18:04 +0800 Subject: [PATCH] update deploy.yml --- .DS_Store | Bin 0 -> 8196 bytes adc_inline_device_access/group_vars/all.yml | 1 - adc_tera_access/group_vars/all.yml | 1 + deploy.yml | 4 ++++ pc_double_arm_access/group_vars/all.yml | 1 + roles/.DS_Store | Bin 0 -> 8196 bytes roles/sapp/.DS_Store | Bin 0 -> 6148 bytes roles/tfe/.DS_Store | Bin 0 -> 6148 bytes roles/tfe/templates/tfe.conf.j2 | 2 +- roles/tsg-env-mcn0/.DS_Store | Bin 0 -> 6148 bytes 10 files changed, 7 insertions(+), 2 deletions(-) create mode 100644 .DS_Store create mode 100644 roles/.DS_Store create mode 100644 roles/sapp/.DS_Store create mode 100644 roles/tfe/.DS_Store create mode 100644 roles/tsg-env-mcn0/.DS_Store diff --git a/.DS_Store b/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..6bf65d5e91e8ee33a835d8cf6db8123905a08c68 GIT binary patch literal 8196 zcmeHM&2G~`5T5N1xPj706g5X*kT^6bC6o#wq$rd_Z%9FK0F>HJlvr|YE4G`K5R?n= z0K5T@!V~ZyJOF&NYf{^FDozNsyVCCL&wR7qZ^m}UAtKREdOJilA~H}}R&SswDZI}0 zTvkngPwgc?LLluaQMPa;Tfj-@BOW(=p~8$S!mo*^4MT z@B+v70vlMq-JYP{`y~r{L>qH^F_0sSE<%4RpzmN84>$|RE@~gw;ZlUYBd=kInfr7~ zN95(NLu?f+RpbdmSPP(Ej`>u;Y{0sYQ`afP-T^Gsv1>#zTA!@Kjz0_Nn{%{63^1vuc!+$e4|eu$;zmDOw44WnXI)+_Hi!(iNrtvHF=*60n7URd$aPWvx|z?=6i`<2@t zcdMJv0zbA~zdw>-x7UZt+t;q&3&!mr@q3Z9(@_hCv1Y7wtF_6b+1%YWo4bwawmI3` zYiyejn~$c`HDl}U&eMa#qto}357UodKop8d-*>pF^5rXr88VJLBi{@B0Yl_U3_=6Y zTA+yoAxBdUp&iix?t4HD+M&m2_b^J}%)fCc0wQN`Yi{rCHm<|90UXD-a)JO0vE#z< z$XUBJx5j8&o+&QJ%1}AUgvv$^s{(U`xze49!zYW*v#m#(flJ50vN}nnl?&_5l#~!OG98DM={V&44@2}#s4}LN W%9)awLHYL|0`&V|60e&p&A@M3IB6IF literal 0 HcmV?d00001 diff --git a/adc_inline_device_access/group_vars/all.yml b/adc_inline_device_access/group_vars/all.yml index f3ffcc0..2bff0fe 100644 --- a/adc_inline_device_access/group_vars/all.yml +++ b/adc_inline_device_access/group_vars/all.yml @@ -60,7 +60,6 @@ kni: enabled: 1 tfe: nr_threads: 16 - kni_ip: 192.168.100.1 mc_cache_eth: ens1.100 keykeeper: mode: "normal" diff --git a/adc_tera_access/group_vars/all.yml b/adc_tera_access/group_vars/all.yml index 86c83d7..2bff0fe 100644 --- a/adc_tera_access/group_vars/all.yml +++ b/adc_tera_access/group_vars/all.yml @@ -60,6 +60,7 @@ kni: enabled: 1 tfe: nr_threads: 16 + mc_cache_eth: ens1.100 keykeeper: mode: "normal" no_cache: 0 diff --git a/deploy.yml b/deploy.yml index 4dda93e..fc424b3 100644 --- a/deploy.yml +++ b/deploy.yml @@ -7,7 +7,9 @@ roles: - tsg-env-mcn0 - mrzcpd + - sapp - kni + - firewall - certstore - hosts: blade-01 @@ -36,6 +38,8 @@ roles: - mrzcpd - framework + - sapp - kni + - firewall - certstore - tfe diff --git a/pc_double_arm_access/group_vars/all.yml b/pc_double_arm_access/group_vars/all.yml index 69c8fc0..5d548ae 100644 --- a/pc_double_arm_access/group_vars/all.yml +++ b/pc_double_arm_access/group_vars/all.yml @@ -54,6 +54,7 @@ kni: enabled: 1 tfe: nr_threads: 32 + mc_cache_eth: ens1.100 keykeeper: mode: "normal" no_cache: 0 diff --git a/roles/.DS_Store b/roles/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..d143f6e71c3373e1412047a8c4b5feefb08ec207 GIT binary patch literal 8196 zcmeHM%Wl&^6ur}g;-pk$0cw`sAh8INLnvJ!q$rd{c1S_60My!v+gfq$C~+ES2+D?k z0RDha;S2Z>J^;=lslroy>IadaRNE&#BI*CHSfKR|G7g-wNXiGqqcrT4%Tl_?j4Njl1HZVqfJoJ*8+ zVvx z$h+RNz@HpcZaj*k#0?^UD9Az2hsn$5LDY*Ut#};uMxvgMEU>JSRXV6tr_)Abw`MnX zomtJE?(I1>`(ESzY*w;%Zq*;Q4^Q8mPv6eoeH4Qsrp^?)E}s|ar`1C}>kOkXj*d~v znI$@ccrKkn#EJO)(Qk(t`98xcD_>s-9w80s4wzwj;xS7GoG@nPT!kq$a-zOBcL>X2(al(r#Us#zF{fK@_l) zj`%mQ^db;bnwCddt*ba{c$zfV#36HxHRof+or$&IMb6R0;ww8XRxWQ{<;xxL1qH2Z zg7WQu5kc=}d3^ITE4BIa`qj{QI1DnptrZjhnxZU=?~x1(oi^dp6e!4=tK9#8od5m* z(%Lr_8wHF4e_jDr-0$qS(2t+LgY_iL|JM!*X$K3y7*_h-P75D)=A3Pxd literal 0 HcmV?d00001 diff --git a/roles/sapp/.DS_Store b/roles/sapp/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..d9873f003453512db76da35b410cfcddce5e3078 GIT binary patch literal 6148 zcmeHK&5qMB5FYQg;1nTxK-xX}g2bVRuFA3pgcOzKus5V2H~`vBXka6 zz#H%=JOPgbGvlG^AJ+;hk2L-!;~6{iDYjz(Q2p`X2%rrB8kMlo!e)a|Kk1t6i6=l* zJVtqz+qX$>leJjy@C5Q_ zvg&q!s=fV2^TtiBTe@|-^(MNslc?2x^Y-C%+Up&6Oz*fm>zL`uNw;Gj^d8P; zfj+o*^!V)J>f@*B=h>I9Tm&fGtXS>{{(*03ER=X1jf&hB@6k&cO{gG-5cWBn~+QrIZ7zv`XoLTcxeafmX2FY|E<4I?8T{N=UV@ z0dLSp=@ayE+L`gR3IxP0YLQ18f8+VF*Pmp24FIY)>Td(I06?P>)|%MdArvQ_lO^%2 zASxcCILPeBIJ5Cwu6K9_JOlq81GIPR@Cj1LAc5KaOGm;U>eeq7{`8s5cw7u*r~ilt zSz45x&QG(YmRd&zc{?Q#%gJs2ml&Xm~`uH&J;Si~ZKx?5`cg@6u#^+**5O z^D;{FWXQ#7Kf#puhiTroG-j4~9uD)&=AY3^6?G^ff&#wG(exdo zvotj@Gl4T0AgK}Cw}@5i4_7=^g6|;b7SYI!mjy5&+dw~Ez+8R`&wyv(|6+j72ZKr& z2v!dH=)i`b0Ejhov!G2s4pd_V1HsB6Mo^S1MRcV~o*2rNqu)qgAXqtc<)Gy8p=4$y zFBHYIlyG2++<+cbz5}*zrO$df3wKzEC?iZ@VMFlNX=3!yqf?3 literal 0 HcmV?d00001 diff --git a/roles/tfe/templates/tfe.conf.j2 b/roles/tfe/templates/tfe.conf.j2 index 08fa194..ad93052 100644 --- a/roles/tfe/templates/tfe.conf.j2 +++ b/roles/tfe/templates/tfe.conf.j2 @@ -6,7 +6,7 @@ breakpad_minidump_dir=/run/tfe/crashreport/ breakpad_upload_url=http://127.0.0.1:9000/ [kni] -ip={{ tfe.kni_ip }} +ip=192.168.100.1 scm_port=2475 watchdog_switch=1 watchdog_port=2476 diff --git a/roles/tsg-env-mcn0/.DS_Store b/roles/tsg-env-mcn0/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..f0b0a416da8928b53a48e3aa6cc2fa19aedb9a43 GIT binary patch literal 6148 zcmeHK%}(Pm5FVEn+#*B|NO1H8i9-)X<>!Eqq5=nQD+R#;5G1rfM2Jz7Qb8%oYp`#y zkFrm&kF(6!rfOBV?pA0<8h_*QjAMU}`~v`@*=?-@Q~^Mu5*Er>d?M6NIw1w;DIyBf zM|v3Rt1#B#L@Ya|lL1=05?n(BF|=WH{pgq2L0$W6#0-BVGVG-fZl!;R4{?-c_4*%C zm?@TK=cKI2%0lJbztufI3$kw73_7P&`w?Wfp|g*)j)!&-9!KroMRjRUCs`0B?T$%~ zT5SwDJBgB(?lpBcX{Dwg-!@2DmgS4;O26M|Y}Qm`vp%S){`PjgrZyT|gF#s?udeSN zUfw@F_g@CDZ)Or8@Mkr$=`kBu2%2L1~Jv_B|RLeF7t(QF-9m?r=tT_cU4O&3SXQ4T$axkYS2 z5jGXkrV97O5H=nC%EfsObBi_|gnN7l_hsQ;D8hUl`&T9$glCaUW`G$OXJE!wt91S! zeEt3(PvROgzzlpV21Ie+-*4iS+}S!YIXY_<>Ln@(#pM=2L34n??&%v$^ZZW literal 0 HcmV?d00001