gfwleak/tsg-tsg-os-buildimage
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

TSG-6960,

Browse Source 
1.修复wire_graft模块多了table键, 导致yml文件格式错误;
2.修复wannat变量引用错误;
3.修复sapp_raw_pkt.conf, 无历史状态主动发包配置错误.
This commit is contained in:
lijia
2021-07-08 17:15:48 +08:00
parent a35fc1fd0b
commit 282ccd2e55
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ansible/roles/sapp/templates/send_raw_pkt.conf.j2
View File

@@ -2,8 +2,8 @@
##(11:ipfile, 12:marsio4, 13:agent_smith, 14:dpdk_vxlan, 15:marsio_vxlan, 16:pag_marsio
#target_id
#0 pag p7p2 eth1 dna0 dpdk ppf npacket qnf n95 eth1 topsec eth1 vxlan_user smith dpdk dpdk pag
#1 pag eth1 eth1 dna0 dpdk ppf npacket qnf n95 eth1 topsec eth1 p7p1 smith dpdk dpdk pag
0 pag p7p2 eth1 dna0 dpdk ppf npacket qnf n95 eth1 topsec eth1 eth_raw smith dpdk dpdk pag
1 pag eth1 eth1 dna0 dpdk ppf npacket qnf n95 eth1 topsec eth1 eth_raw smith dpdk dpdk pag
#2 pag eth1 eth1 dna0 dpdk ppf npacket qnf n95 eth1 topsec eth1 p7p1 smith dpdk dpdk pag
#3 pag eth1 eth1 dna0 dpdk ppf npacket qnf n95 eth1 topsec eth1 p7p2 smith dpdk dpdk pag
#4 pag eth1 eth1 dna0 dpdk ppf npacket qnf n95 eth1 topsec eth1 p7p2 smith dpdk dpdk pag

2
ansible/roles/tsg-os-provision/files/provision_tasks_files/provision.yml.7400MCN0P01R01
View File

@@ -156,7 +156,7 @@
src: "../templates/wire_graft.conf.j2"
dest: /home/mesasoft/sapp_run/etc/wire_graft/wire_graft.conf
tags: wire_graft
- name: "mkdir /opt/tsg/etc/"
file:
path: /opt/tsg/etc

2
ansible/roles/wire_graft/templates/wire_graft.conf.j2.j2
View File

@@ -17,7 +17,7 @@ mirror_linkinfo_project_name=mirror_linkinfo_from_mac
[toroad]
sendto_toroad_enable={{ wire_graft.wire_graft_conf.toroad.sendto_toroad_enable }}
{% raw %}toroad_ip={{ wannat_toroad.server_ip }}
toroad_port={{ wannat_toroad.toroad.server_port }}
toroad_port={{ wannat_toroad.server_port }}
{% endraw %}
[log]