From 282ccd2e55d7c119d8e9558d076a70c6b6e45f7e Mon Sep 17 00:00:00 2001 From: lijia Date: Thu, 8 Jul 2021 17:15:48 +0800 Subject: [PATCH] =?UTF-8?q?TSG-6960,=201.=E4=BF=AE=E5=A4=8Dwire=5Fgraft?= =?UTF-8?q?=E6=A8=A1=E5=9D=97=E5=A4=9A=E4=BA=86table=E9=94=AE,=20=E5=AF=BC?= =?UTF-8?q?=E8=87=B4yml=E6=96=87=E4=BB=B6=E6=A0=BC=E5=BC=8F=E9=94=99?= =?UTF-8?q?=E8=AF=AF;=202.=E4=BF=AE=E5=A4=8Dwannat=E5=8F=98=E9=87=8F?= =?UTF-8?q?=E5=BC=95=E7=94=A8=E9=94=99=E8=AF=AF;=203.=E4=BF=AE=E5=A4=8Dsap?= =?UTF-8?q?p=5Fraw=5Fpkt.conf,=20=E6=97=A0=E5=8E=86=E5=8F=B2=E7=8A=B6?= =?UTF-8?q?=E6=80=81=E4=B8=BB=E5=8A=A8=E5=8F=91=E5=8C=85=E9=85=8D=E7=BD=AE?= =?UTF-8?q?=E9=94=99=E8=AF=AF.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ansible/roles/sapp/templates/send_raw_pkt.conf.j2 | 4 ++-- .../files/provision_tasks_files/provision.yml.7400MCN0P01R01 | 2 +- ansible/roles/wire_graft/templates/wire_graft.conf.j2.j2 | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ansible/roles/sapp/templates/send_raw_pkt.conf.j2 b/ansible/roles/sapp/templates/send_raw_pkt.conf.j2 index 41d148dc..32c83d1a 100644 --- a/ansible/roles/sapp/templates/send_raw_pkt.conf.j2 +++ b/ansible/roles/sapp/templates/send_raw_pkt.conf.j2 @@ -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 \ No newline at end of file diff --git a/ansible/roles/tsg-os-provision/files/provision_tasks_files/provision.yml.7400MCN0P01R01 b/ansible/roles/tsg-os-provision/files/provision_tasks_files/provision.yml.7400MCN0P01R01 index 311583e1..3346ee19 100644 --- a/ansible/roles/tsg-os-provision/files/provision_tasks_files/provision.yml.7400MCN0P01R01 +++ b/ansible/roles/tsg-os-provision/files/provision_tasks_files/provision.yml.7400MCN0P01R01 @@ -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 diff --git a/ansible/roles/wire_graft/templates/wire_graft.conf.j2.j2 b/ansible/roles/wire_graft/templates/wire_graft.conf.j2.j2 index c7c9859f..3de41271 100644 --- a/ansible/roles/wire_graft/templates/wire_graft.conf.j2.j2 +++ b/ansible/roles/wire_graft/templates/wire_graft.conf.j2.j2 @@ -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]