From 45a4e4df239089544483ebc33a8543735603cfdb Mon Sep 17 00:00:00 2001 From: luwenpeng Date: Fri, 1 Jul 2022 11:29:51 +0800 Subject: [PATCH] =?UTF-8?q?TSG-11125=20K3S=E4=B8=AD=E5=88=9B=E5=BB=BA?= =?UTF-8?q?=E6=94=AF=E6=8C=81=E5=A4=9A=E9=98=9F=E5=88=97=E7=9A=84TAP?= =?UTF-8?q?=E7=BD=91=E5=8D=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * 并将网卡名称从tun_kni修正为tap0 --- ansible/roles/kni/templates/kni.conf.j2 | 2 +- .../roles/tfe/templates/tfe-env-start.sh.j2 | 26 +++++++++---------- .../roles/tfe/templates/tfe-env-stop.sh.j2 | 14 +++++----- .../provision.yml.TSGXNXR620G40R01P0906-init | 4 +-- 4 files changed, 23 insertions(+), 23 deletions(-) diff --git a/ansible/roles/kni/templates/kni.conf.j2 b/ansible/roles/kni/templates/kni.conf.j2 index 68d14907..989a877e 100644 --- a/ansible/roles/kni/templates/kni.conf.j2 +++ b/ansible/roles/kni/templates/kni.conf.j2 @@ -13,7 +13,7 @@ deploy_mode = tun {% else %} deploy_mode = normal {% endif %} -tun_name = tun_kni +tun_name = tap0 src_mac_addr = 00:0e:c6:d6:72:c1 dst_mac_addr = fe:65:b7:03:50:bd diff --git a/ansible/roles/tfe/templates/tfe-env-start.sh.j2 b/ansible/roles/tfe/templates/tfe-env-start.sh.j2 index 3b47fffa..9763cc99 100644 --- a/ansible/roles/tfe/templates/tfe-env-start.sh.j2 +++ b/ansible/roles/tfe/templates/tfe-env-start.sh.j2 @@ -1,22 +1,22 @@ #!/bin/bash -ex -/usr/sbin/ip link set tun_kni address fe:65:b7:03:50:bd -/usr/sbin/ip link set tun_kni up -/usr/sbin/ip addr flush dev tun_kni -/usr/sbin/ip addr add 172.16.241.2/30 dev tun_kni -/usr/sbin/ip neigh flush dev tun_kni -/usr/sbin/ip neigh add 172.16.241.1 lladdr 00:0e:c6:d6:72:c1 dev tun_kni nud permanent -/usr/sbin/ip6tables -A INPUT -i tun_kni -m bpf --bytecode '17,48 0 0 0,84 0 0 240,21 0 13 96,48 0 0 6,21 0 11 6,40 0 0 4,37 0 9 24,48 0 0 52,84 0 0 240,116 0 0 2,53 0 5 24,48 0 0 60,21 0 3 88,48 0 0 61,21 0 1 4,6 0 0 65535,6 0 0 0' -j NFQUEUE --queue-num 1 -/usr/sbin/iptables -A INPUT -i tun_kni -m bpf --bytecode '18,48 0 0 0,84 0 0 240,21 0 14 64,48 0 0 9,21 0 12 6,40 0 0 6,69 10 0 8191,177 0 0 0,80 0 0 12,84 0 0 240,116 0 0 2,53 0 5 24,80 0 0 20,21 0 3 88,80 0 0 21,21 0 1 4,6 0 0 65535,6 0 0 0' -j NFQUEUE --queue-num 1 +/usr/sbin/ip link set tap0 address fe:65:b7:03:50:bd +/usr/sbin/ip link set tap0 up +/usr/sbin/ip addr flush dev tap0 +/usr/sbin/ip addr add 172.16.241.2/30 dev tap0 +/usr/sbin/ip neigh flush dev tap0 +/usr/sbin/ip neigh add 172.16.241.1 lladdr 00:0e:c6:d6:72:c1 dev tap0 nud permanent +/usr/sbin/ip6tables -A INPUT -i tap0 -m bpf --bytecode '17,48 0 0 0,84 0 0 240,21 0 13 96,48 0 0 6,21 0 11 6,40 0 0 4,37 0 9 24,48 0 0 52,84 0 0 240,116 0 0 2,53 0 5 24,48 0 0 60,21 0 3 88,48 0 0 61,21 0 1 4,6 0 0 65535,6 0 0 0' -j NFQUEUE --queue-num 1 +/usr/sbin/iptables -A INPUT -i tap0 -m bpf --bytecode '18,48 0 0 0,84 0 0 240,21 0 14 64,48 0 0 9,21 0 12 6,40 0 0 6,69 10 0 8191,177 0 0 0,80 0 0 12,84 0 0 240,116 0 0 2,53 0 5 24,80 0 0 20,21 0 3 88,80 0 0 21,21 0 1 4,6 0 0 65535,6 0 0 0' -j NFQUEUE --queue-num 1 -/usr/sbin/ip rule add iif tun_kni tab 100 +/usr/sbin/ip rule add iif tap0 tab 100 /usr/sbin/ip route add local default dev lo table 100 /usr/sbin/ip rule add fwmark 0x65 lookup 101 -/usr/sbin/ip route add default dev tun_kni via 172.16.241.1 table 101 +/usr/sbin/ip route add default dev tap0 via 172.16.241.1 table 101 -/usr/sbin/ip addr add fd00::02/64 dev tun_kni +/usr/sbin/ip addr add fd00::02/64 dev tap0 /usr/sbin/ip -6 route add default via fd00::01 -/usr/sbin/ip -6 rule add iif tun_kni tab 102 +/usr/sbin/ip -6 rule add iif tap0 tab 102 /usr/sbin/ip -6 route add local default dev lo table 102 -/usr/sbin/ip -6 neigh add fd00::01 lladdr 00:0e:c6:d6:72:c1 dev tun_kni nud permanent +/usr/sbin/ip -6 neigh add fd00::01 lladdr 00:0e:c6:d6:72:c1 dev tap0 nud permanent diff --git a/ansible/roles/tfe/templates/tfe-env-stop.sh.j2 b/ansible/roles/tfe/templates/tfe-env-stop.sh.j2 index d0052e35..468889c8 100644 --- a/ansible/roles/tfe/templates/tfe-env-stop.sh.j2 +++ b/ansible/roles/tfe/templates/tfe-env-stop.sh.j2 @@ -1,12 +1,12 @@ #!/bin/bash -ex -/usr/sbin/ip6tables -D INPUT -i tun_kni -m bpf --bytecode '17,48 0 0 0,84 0 0 240,21 0 13 96,48 0 0 6,21 0 11 6,40 0 0 4,37 0 9 24,48 0 0 52,84 0 0 240,116 0 0 2,53 0 5 24,48 0 0 60,21 0 3 88,48 0 0 61,21 0 1 4,6 0 0 65535,6 0 0 0' -j NFQUEUE --queue-num 1 -/usr/sbin/iptables -D INPUT -i tun_kni -m bpf --bytecode '18,48 0 0 0,84 0 0 240,21 0 14 64,48 0 0 9,21 0 12 6,40 0 0 6,69 10 0 8191,177 0 0 0,80 0 0 12,84 0 0 240,116 0 0 2,53 0 5 24,80 0 0 20,21 0 3 88,80 0 0 21,21 0 1 4,6 0 0 65535,6 0 0 0' -j NFQUEUE --queue-num 1 -/usr/sbin/ip rule del iif tun_kni tab 100 +/usr/sbin/ip6tables -D INPUT -i tap0 -m bpf --bytecode '17,48 0 0 0,84 0 0 240,21 0 13 96,48 0 0 6,21 0 11 6,40 0 0 4,37 0 9 24,48 0 0 52,84 0 0 240,116 0 0 2,53 0 5 24,48 0 0 60,21 0 3 88,48 0 0 61,21 0 1 4,6 0 0 65535,6 0 0 0' -j NFQUEUE --queue-num 1 +/usr/sbin/iptables -D INPUT -i tap0 -m bpf --bytecode '18,48 0 0 0,84 0 0 240,21 0 14 64,48 0 0 9,21 0 12 6,40 0 0 6,69 10 0 8191,177 0 0 0,80 0 0 12,84 0 0 240,116 0 0 2,53 0 5 24,80 0 0 20,21 0 3 88,80 0 0 21,21 0 1 4,6 0 0 65535,6 0 0 0' -j NFQUEUE --queue-num 1 +/usr/sbin/ip rule del iif tap0 tab 100 /usr/sbin/ip route del local default dev lo table 100 /usr/sbin/ip rule del fwmark 0x65 lookup 101 -/usr/sbin/ip route del default dev tun_kni via 172.16.241.1 table 101 -/usr/sbin/ip -6 rule del iif tun_kni tab 102 +/usr/sbin/ip route del default dev tap0 via 172.16.241.1 table 101 +/usr/sbin/ip -6 rule del iif tap0 tab 102 /usr/sbin/ip -6 route del default via fd00::01 /usr/sbin/ip -6 route del local default dev lo table 102 -/usr/sbin/ip addr del fd00::02/64 dev tun_kni -/usr/sbin/ip link set tun_kni down +/usr/sbin/ip addr del fd00::02/64 dev tap0 +/usr/sbin/ip link set tap0 down diff --git a/ansible/roles/tsg-os-provision/files/tasks/provision.yml.TSGXNXR620G40R01P0906-init b/ansible/roles/tsg-os-provision/files/tasks/provision.yml.TSGXNXR620G40R01P0906-init index 2e0e4ae5..589e5f30 100644 --- a/ansible/roles/tsg-os-provision/files/tasks/provision.yml.TSGXNXR620G40R01P0906-init +++ b/ansible/roles/tsg-os-provision/files/tasks/provision.yml.TSGXNXR620G40R01P0906-init @@ -209,8 +209,8 @@ - name: "create tap device ctrl_mock" shell: ip tuntap add mode tap ctrl_mock; ifconfig ctrl_mock up; ifconfig ctrl_mock {{ policy_and_log_nic_ip }}/32 - - name: "create tap device tun_kni" - shell: ip tuntap add mode tap tun_kni + - name: "create tap device tap0" + shell: ip tuntap add dev tap0 mode tap multi_queue when: proxy.enable == 1 - name: "execute tfe-env shell"