From e6fbb265a82a3e8939cc54707358616579e0fcf4 Mon Sep 17 00:00:00 2001 From: zhangzhihan Date: Wed, 24 Jun 2020 18:08:40 +0800 Subject: [PATCH] update --- .DS_Store | Bin 6148 -> 0 bytes install_config/group_vars/all.yml | 25 ++++++------ roles/.DS_Store | Bin 8196 -> 0 bytes roles/clotho/templates/clotho.conf.j2 | 4 +- roles/firewall/tasks/main.yml | 1 + .../templates/capture_packet_plug.conf.j2 | 4 +- roles/firewall/templates/main.conf.j2 | 4 +- roles/framework/.DS_Store | Bin 6148 -> 0 bytes roles/framework/tasks/main.yml | 9 ++--- roles/kni/templates/kni.conf.j2 | 20 +++++----- roles/mrzcpd/.DS_Store | Bin 6148 -> 0 bytes .../templates/mrglobal.conf.ATCA_40G.j2 | 2 +- .../templates/mrtunnat.conf.ATCA_40G.j2 | 6 ++- roles/proxy_status/.DS_Store | Bin 6148 -> 0 bytes roles/proxy_status/tasks/main.yml | 5 +-- roles/sapp/.DS_Store | Bin 6148 -> 0 bytes roles/sapp/templates/sapp.toml.j2 | 14 ++++++- .../templates/telegraf_statistic.conf.j2 | 2 +- roles/tfe/templates/pangu_pxy.conf.j2 | 4 +- roles/tfe/templates/tfe-env-config.j2 | 4 +- roles/tfe/templates/tfe.conf.j2 | 6 +-- roles/tsg-env-tun-mode/templates/setup.j2 | 36 +++++++++--------- .../templates/tsg-env_stop.j2 | 8 ++-- 23 files changed, 83 insertions(+), 71 deletions(-) delete mode 100644 .DS_Store delete mode 100644 roles/.DS_Store delete mode 100644 roles/framework/.DS_Store delete mode 100644 roles/mrzcpd/.DS_Store delete mode 100644 roles/proxy_status/.DS_Store delete mode 100644 roles/sapp/.DS_Store diff --git a/.DS_Store b/.DS_Store deleted file mode 100644 index f27c20a5bcf2fa1a03b6524fab4088db259c326e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6148 zcmeHKO-~a+7=8x|Zi~qBQNWMG#>Rw%#uQYDF~+4}wDAC;1R;QB+iuIo?M&U>QcK13 zUzq68lV{@(@an;k`?UaReOao_fOl(uR3-; zr;p4t8dwgsJwbMgHl}Pob!d^*)2v2|zUU__1DY1qqB;F?vpF?=cP42}r&9Y#qd7a9 zN*cFs&Ft?-wXqvh_cPm-#$NN){_D3~D%>1#cN8|Dunq69aYPNLu&dTcKDO8RUDw;I zjK=yd_Fo#%2Zx3SM+W2Z_~=-CeCW#6oIael3eU?PpYJ?#nU{8Jc1|DgQGrZ>(IwB` z#nr9__RApa>|to=7-88iK09=+G^&_0a_A79KJsjvZj?QzxL7LrcCf}rD0s|umzeJa z4x{TwqU)Pt^uVrUXo=y7dc zW^@wH{7Fqq>pSzAgcArA2o*SQ3h@2Gz{1f~*peu=4y?o#05O7YVc6!s3!GypG!?ca zVg!vyDx#zkb;Tf(j($VsnF?DHB^`*md=NDbjwGb zpZ^a}zyEiV!lzJyP=WtS0TNlrE~Ifu>TEr+IDXa|Shlfn<9RKKf`XMgjzxnX#p76n bVa(tSL{ni)B6`rm9|0jlScMAwQw4qlb%phe diff --git a/install_config/group_vars/all.yml b/install_config/group_vars/all.yml index 295a37d..442e8be 100644 --- a/install_config/group_vars/all.yml +++ b/install_config/group_vars/all.yml @@ -1,9 +1,9 @@ ######################################### #####0: Pcap; 1: Inline_device; 2: Allot; 3: ADC_Tun_mode; 4: ATCA; -tsg_access_type: 0 +tsg_access_type: 4 -#####0: Tun_mode; 1: ADC; -tsg_running_type: 0 +#####0: Tun_mode; 1: normal; 2: ADC; +tsg_running_type: 1 ######################################## maat_redis_server: @@ -21,7 +21,7 @@ cert_store_server: port: 9991 log_kafkabrokers: - address: "192.168.40.169:9092" + address: "1.1.1.1:9092,2.2.2.2:9092" log_minio: address: "192.168.40.168;" @@ -35,7 +35,9 @@ fs_remote: ######################################## sapp: worker_threads: 16 + send_only_threads_max: 8 bind_mask: 1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16 + inbound_route_dir: 1 ######################################## kni: @@ -49,12 +51,9 @@ kni: send_logger: switch: 1 tfe_nodes: - - tfe0: - enabled: 1 - - tfe1: - enabled: 1 - - tfe2: - enabled: 1 + tfe0_enabled: 1 + tfe1_enabled: 1 + tfe2_enabled: 1 ######################################## tfe: @@ -72,7 +71,7 @@ mrtunnat: lcore_id: 38 nic_data_incoming: - name: enp1s0 + ethname: enp1s0 vf0_name: enp1s2 vf1_name: enp1s2f1 vf2_name: enp1s2f2 @@ -80,8 +79,10 @@ nic_data_incoming: VlanFlipping: vlanID_1: 100 vlanID_2: 101 + vlanID_3: 103 + vlanID_4: 104 ######################################## -tsg_tun_mode: +server: ethname: eth0 tun_name: eth0.100 internal_interface: "eth2" diff --git a/roles/.DS_Store b/roles/.DS_Store deleted file mode 100644 index b3d2c072f333f49763543785c4c9467baff5a729..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 8196 zcmeHM-EPw`6h2 z;T;e>0k6Uf@E|+@e8)Cb;&!4}2yJ#{A1D4kC;ohD_qaqPn!{e5XoH9xWVV$x6bll! zbDm2p`pzb-0H0`!V(L?md`jlf_J&o!Dqt0`3RnfK0{?>o*t0n~SM2+$)s|KPtH6y^ zfY%2XnQcScsj_nEKp{f_*dlJrggW8?$#J!9XggI_QqiZ19)zX}9byPYN4v{#*oL-K zWfh%-qLa{17CJ%^^6B8Y5>BF_tSzkqR)Kj1ICd{n7g2jmX*Pa82%>H$h&pKJuhbLd zhreV(ji@x^B;Z9H_Zy6F24fYB0LYY1D9U5Sx`B1*2xkaE@ANHbAGa81yME28C4USWCO6|(# zcwFCpyjyj*Yqd$$9q;Ycs_vtm-N~fntUstfJvcmje>wgz`S=CnLK1peqj0letUoH1f=$TA9a zN+J2iEU_PCQLE@Frc1oXfO-a&ec(#$wVlhHBE~Ehaq8wlsez#s`+iob8SdJuG#jCz zkOLoQ5AD;jTrZCDO0i!HC*#)z;ExuqY&p~&pc3@Bg?>Xim;T>Ht(Nayz+;!<)eRoz zZzX||p`m9j0{tL+crg`S3GR8ES1G=4|5w^4Z!JNroM?7@!W<8(MZ?L6Ptc^Reo zaBPy(WQZZ}PtrWm)4rbMNn!d4ZG)7a^iDhLRn^;kv)xsjzCY`#YG=pqs;$@CvzaGf zZ1naH&#u0Ft*&R^ZpHHkMl+l6`A}HW;fu}oco#zRw zEX)8izzi%g18x_T&z5+MJTzv28TdC0(EgxM2?K|z}} z))uh^Mc7nCn=0HBL)dimD;F0ytS#Df5bp6I+?R!Wp$PMJ>|dF15P?N5nE__tF#{{M z+M)CR;Lq>>$4Ojc2AF~WiUH9ago8d#$(^kWlcTd%p`M|VP+V>CAq5R{6k{wM#V=8f ZpkI-J7&xpgq6dX90)_@In1R2_z)y{;X#W5J diff --git a/roles/framework/tasks/main.yml b/roles/framework/tasks/main.yml index f1ac7f8..ed8fb4b 100644 --- a/roles/framework/tasks/main.yml +++ b/roles/framework/tasks/main.yml @@ -4,11 +4,10 @@ dest: "/tmp/ansible_deploy/" - name: "install framework packages" -# yum: -# name: "{{ packages }}" -# state: present -# skip_broken: yes - shell: "rpm -ivh /tmp/ansible_deploy/{{ packages }}" + yum: + name: "{{ packages }}" + state: present + skip_broken: yes vars: packages: - /tmp/ansible_deploy/libMESA_field_stat-1.0.1.852c2df-1.el7.x86_64.rpm diff --git a/roles/kni/templates/kni.conf.j2 b/roles/kni/templates/kni.conf.j2 index a48cfc9..0c84c50 100644 --- a/roles/kni/templates/kni.conf.j2 +++ b/roles/kni/templates/kni.conf.j2 @@ -2,8 +2,8 @@ log_path = ./log/kni/kni.log log_level = {{ kni.global.log_level }} tfe_node_count = {{ kni.global.tfe_node_count }} -{% if tsg_running_type == 0 %} -manage_eth = {{ tsg_tun_mode.ethname }} +{% if tsg_running_type == 0 or 1 %} +manage_eth = {{ server.ethname }} {% else %} manage_eth = {{ nic_mgr.name }} {% endif %} @@ -20,26 +20,26 @@ dst_mac_addr = fe:65:b7:03:50:bd enabled = 1 dev_eth_symbol = {{ nic_data_incoming.vf1_name }} ip_addr = 192.168.100.1 -{% elif tsg_running_type == 1 %} +{% elif tsg_running_type == 2 %} [tfe0] -enabled = 1 +enabled = {{ kni.tfe_nodes.tfe0_enabled }} dev_eth_symbol = {{ nic_to_tfe.tfe0.name }} ip_addr = 192.168.100.2 [tfe1] -enabled = 1 +enabled = {{ kni.tfe_nodes.tfe1_enabled }} dev_eth_symbol = {{ nic_to_tfe.tfe1.name }} ip_addr = 192.168.100.3 [tfe2] -enabled = 1 +enabled = {{ kni.tfe_nodes.tfe2_enabled }} dev_eth_symbol = {{ nic_to_tfe.tfe2.name }} ip_addr = 192.168.100.4 {% endif %} [tfe_cmsg_receiver] -{% if tsg_running_type == 0 %} -listen_eth = {{ tsg_tun_mode.tun_name }} +{% if tsg_running_type == 0 or 1%} +listen_eth = {{ server.tun_name }} {% else %} listen_eth = {{ nic_inner_ctrl.name }} {% endif %} @@ -47,8 +47,8 @@ listen_port = 2475 [watch_dog] switch = {{ kni.watch_dog.switch }} -{% if tsg_running_type == 0 %} -listen_eth = {{ tsg_tun_mode.tun_name }} +{% if tsg_running_type == 0 or 1 %} +listen_eth = {{ server.tun_name }} {% else %} listen_eth = {{ nic_inner_ctrl.name }} {% endif %} diff --git a/roles/mrzcpd/.DS_Store b/roles/mrzcpd/.DS_Store deleted file mode 100644 index 9c4f0597bd7f293c11fd74884e4f4de252e900a9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6148 zcmeHK!EO^V5FMupc!R3ufK<5og2W+*O^2o8XfU9z;RZr4$ELqtQW z{SNp7ex*Oa=fI3@sx*OX1ZYMYzwvm+UO!v*8URFZGVB1f06?M=);uhJBh*g1A~ok} zAPUn*ahmD(ai-&ySa$rK4A9y&-~*(PK>~~GM_b|m_4yAY=JOXK<7qK+D}5V}va~3D z|GTJd)Ef^TO4*dn&E~uCLQlgoDknuR8o#01SyW!c&VH$Nc4tTNt2CMRTaS-)UPfu2 zj7@SnOfcl_>ogzgX-`k`VPX0SZG)7a^!lx*vstJ6Vy~^bzCUlP+5W!YR=YcU^SLLt zpLGsT2Unl2XP@UcU(75(;BGatHHkMl+l0^A}HW;g{N=Wy2z7< zkqKPE2w9Dcy~M28Udq5K3p2nBFav92z@38f(b`7jftUei;9p^Y&Ig4`7&xpfnxg{? z^8`SwquU7D^y5f5%3H1@V-^m;4Wg<&0T*E43hX&L&p$$qDprKhvt+--jT7}7np#A3 zem<@ulZcFPQ@L2!n>{z**++&mCkOWA81W14cNZlEfg7;MkzE(HCqgga^y>{tEnwC%0;vJ&^%eQ zLs35+`xjp>T0^2o8XfU9z;RZr4$ELqtQW z{SNp7ex*Oa=fI3@sx*OX1ZYMYzwvm+UO!v*8URFZGVB1f06?M=);uhJBh*g1A~ok} zAPUn*ahmD(ai-&ySa$rK4A9y&-~*(PK>~~GM_b|m_4yAY=JOXK<7qK+D}5V}va~3D z|GTJd)Ef^TO4*dn&E~uCLQlgoDknuR8o#01SyW!c&VH$Nc4tTNt2CMRTaS-)UPfu2 zj7@SnOfcl_>ogzgX-`k`VPX0SZG)7a^!lx*vstJ6Vy~^bzCUlP+5W!YR=YcU^SLLt zpLGsT2Unl2XP@UcU(75(;BGatHHkMl+l0^A}HW;g{N=Wy2z7< zkqKPE2w9Dcy~M28Udq5K3p2nBFav92z@38f(b`7jftUei;9p^Y&Ig4`7&xpfnxg{? z^8`SwquU7D^y5f5%3 /sys/class/net/{{ nic_data_incoming.name }}/device/sriov_numvfs -ip link set {{ nic_data_incoming.name }} vf 1 vlan 4095 -ip link set {{ nic_data_incoming.name }} vf 2 vlan 4095 -ip link set {{ nic_data_incoming.name }} vf 0 trust on -ip link set {{ nic_data_incoming.name }} vf 1 trust on -ip link set {{ nic_data_incoming.name }} vf 2 trust on -ip link set {{ nic_data_incoming.name }} vf 1 mac 00:0e:c6:d6:72:c1 -ip link set {{ nic_data_incoming.name }} vf 2 mac fe:65:b7:03:50:bd -ip link set {{ nic_data_incoming.name }} vf 0 spoofchk off +echo 3 > /sys/class/net/{{ nic_data_incoming.ethname }}/device/sriov_numvfs +ip link set {{ nic_data_incoming.ethname }} vf 1 vlan 4095 +ip link set {{ nic_data_incoming.ethname }} vf 2 vlan 4095 +ip link set {{ nic_data_incoming.ethname }} vf 0 trust on +ip link set {{ nic_data_incoming.ethname }} vf 1 trust on +ip link set {{ nic_data_incoming.ethname }} vf 2 trust on +ip link set {{ nic_data_incoming.ethname }} vf 1 mac 00:0e:c6:d6:72:c1 +ip link set {{ nic_data_incoming.ethname }} vf 2 mac fe:65:b7:03:50:bd +ip link set {{ nic_data_incoming.ethname }} vf 0 spoofchk off ip link set {{ nic_data_incoming.vf0_name }} up ip link set {{ nic_data_incoming.vf1_name }} up ip link set {{ nic_data_incoming.vf2_name }} up diff --git a/roles/tsg-env-tun-mode/templates/tsg-env_stop.j2 b/roles/tsg-env-tun-mode/templates/tsg-env_stop.j2 index 7393749..8d7a9ce 100644 --- a/roles/tsg-env-tun-mode/templates/tsg-env_stop.j2 +++ b/roles/tsg-env-tun-mode/templates/tsg-env_stop.j2 @@ -1,8 +1,8 @@ #!/bin/bash # -echo 0 >/sys/class/net/{{ tsg_tun_mode.ethname }}/device/sriov_numvfs -ifconfig {{ tsg_tun_mode.ethname }}.100 down -vconfig rem {{ tsg_tun_mode.ethname }}.100 +echo 0 >/sys/class/net/{{ server.ethname }}/device/sriov_numvfs +ifconfig {{ server.ethname }}.100 down +vconfig rem {{ server.ethname }}.100 {% if tsg_access_type == 4 %} -echo 0 >/sys/class/net/{{ nic_data_incoming.name }}/device/sriov_numvfs +echo 0 >/sys/class/net/{{ nic_data_incoming.ethname }}/device/sriov_numvfs {% endif %}