From a41d1f97d3c5ca4a3dc71983ecd3587b33475b1c Mon Sep 17 00:00:00 2001 From: fumingwei Date: Thu, 17 Jun 2021 17:36:30 +0800 Subject: [PATCH] =?UTF-8?q?7400=20adapt:=E4=BF=AE=E6=94=B9mrzcpd=20role?= =?UTF-8?q?=E4=B8=AD=E6=96=87=E4=BB=B6=E7=9B=AE=E5=BD=95=E7=BB=93=E6=9E=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../group_vars/stage_one_tsg_7400.yml | 28 ++++--- ansible/roles/mrzcpd/tasks/main.yml | 4 +- .../mcn0_with_firewall/mrglobal.conf.j2.j2 | 78 ------------------- .../tsg_7400/mrglobal.conf.mcn0.j2.j2 | 78 +++++++++++++++++++ ...global.conf.j2 => mrglobal.conf.mcn123.j2} | 6 +- 5 files changed, 96 insertions(+), 98 deletions(-) delete mode 100644 ansible/roles/mrzcpd/templates/tsg_7400/mcn0_with_firewall/mrglobal.conf.j2.j2 create mode 100644 ansible/roles/mrzcpd/templates/tsg_7400/mrglobal.conf.mcn0.j2.j2 rename ansible/roles/mrzcpd/templates/tsg_7400/{mcn123_with_proxy/mrglobal.conf.j2 => mrglobal.conf.mcn123.j2} (57%) diff --git a/ansible/install_config/group_vars/stage_one_tsg_7400.yml b/ansible/install_config/group_vars/stage_one_tsg_7400.yml index 65c886c6..d539755f 100644 --- a/ansible/install_config/group_vars/stage_one_tsg_7400.yml +++ b/ansible/install_config/group_vars/stage_one_tsg_7400.yml @@ -29,18 +29,16 @@ kni: listen_eth: eth_pf.100 mrzcpd: - mcn0_with_firewall: - mrglobal_conf: - device: - nic_raw: eth_raw - nic_mcn1: eth_mcn1 - nic_mcn2: eth_mcn2 - nic_mcn3: eth_mcn3 - service: - iocore: 52,53,54,55 - mcn123_with_proxy: - mrglobal_conf: - device: - nic_mirr: eth_mirr_d - service: - iocore: 53,54 \ No newline at end of file + mrglobal_conf_mcn0: + device: + nic_raw: eth_raw + nic_mcn1: eth_mcn1 + nic_mcn2: eth_mcn2 + nic_mcn3: eth_mcn3 + service: + iocore: 52,53,54,55 + mrglobal_conf_mcn123: + device: + nic_mirr: eth_mirr_d + service: + iocore: 53,54 \ No newline at end of file diff --git a/ansible/roles/mrzcpd/tasks/main.yml b/ansible/roles/mrzcpd/tasks/main.yml index 684813d7..fa77bec8 100644 --- a/ansible/roles/mrzcpd/tasks/main.yml +++ b/ansible/roles/mrzcpd/tasks/main.yml @@ -19,14 +19,14 @@ - name: "update mrglobal.conf - TSG7400 - mcn0" template: - src: "{{ role_path }}/templates/tsg_7400/mcn0_with_firewall/mrglobal.conf.j2.j2" + src: "{{ role_path }}/templates/tsg_7400/mrglobal.conf.mcn0.j2.j2" dest: /opt/tsg/tsg-os-provision/templates/mrglobal.conf.j2 when: - PROFILE_ID == '7400-MCN0-P01R01' - name: "update mrglobal.conf - TSG7400 - mcn1 mcn2 mcn3" template: - src: "{{ role_path }}/templates/tsg_7400/mcn123_with_proxy/mrglobal.conf.j2" + src: "{{ role_path }}/templates/tsg_7400/mrglobal.conf.mcn123.j2" dest: /opt/mrzcpd/etc/mrglobal.conf when: - PROFILE_ID == '7400-MCN123-P01R01' diff --git a/ansible/roles/mrzcpd/templates/tsg_7400/mcn0_with_firewall/mrglobal.conf.j2.j2 b/ansible/roles/mrzcpd/templates/tsg_7400/mcn0_with_firewall/mrglobal.conf.j2.j2 deleted file mode 100644 index 478319cb..00000000 --- a/ansible/roles/mrzcpd/templates/tsg_7400/mcn0_with_firewall/mrglobal.conf.j2.j2 +++ /dev/null @@ -1,78 +0,0 @@ -[device] -device={{ mrzcpd.mcn0_with_firewall.mrglobal_conf.device.nic_raw }},{{ mrzcpd.mcn0_with_firewall.mrglobal_conf.device.nic_mcn1 }},{{ mrzcpd.mcn0_with_firewall.mrglobal_conf.device.nic_mcn2 }},{{ mrzcpd.mcn0_with_firewall.mrglobal_conf.device.nic_mcn3 }},vxlan_user,vxlan_fwd -sz_tunnel=8192 -sz_buffer=0 - -[device:{{ mrzcpd.mcn0_with_firewall.mrglobal_conf.device.nic_raw }}] -{% raw %} -{% if NPB_device == 'inline_device' %} -in_addr={{inline_device_config.keepalive_ip}} -in_mask={{inline_device_config.keepalive_mask}} -vlan-id-allow=1000,1001,4000,4001 -{% endif %} -{% if NPB_device == 'tera' %} -vlan-id-allow= {{ access_vlan_id_list | join(",") }},4000,4001 -{% endif %} -{% endraw %} -jumbo_frame=1 -max_rx_pkt_len=15360 -clear_tx_flags=1 -vlan-filter=1 -vlan-pvid=0 -vlan-pvid-mode=2 -promisc=1 - -[device:{{ mrzcpd.mcn0_with_firewall.mrglobal_conf.device.nic_mcn1 }}] -jumbo_frame=1 -max_rx_pkt_len=15360 -clear_tx_flags=1 -promisc=1 - -[device:{{ mrzcpd.mcn0_with_firewall.mrglobal_conf.device.nic_mcn2 }}] -jumbo_frame=1 -max_rx_pkt_len=15360 -clear_tx_flags=1 -promisc=1 - -[device:{{ mrzcpd.mcn0_with_firewall.mrglobal_conf.device.nic_mcn3 }}] -jumbo_frame=1 -max_rx_pkt_len=15360 -clear_tx_flags=1 -promisc=1 - -[service] -# lcore id for i/o service, use comma to split -iocore={{ mrzcpd.mcn0_with_firewall.mrglobal_conf.service.iocore }} -distmode=2 -hashmode=0 - -[eal] -virtaddr=0x7f40c4a00000 -loglevel=7 - -[keepalive] -check_spinlock=0 - -[ctrlzone] -ctrlzone0=tunnat,64 - -[pool] -create_mode=3 -sz_direct_pktmbuf=4194304 -sz_indirect_pktmbuf=8192 -sz_cache=256 -sz_data=4096 - -[forward] -nr_forward_rule=10 -forward_rule_0=pv,{{ mrzcpd.mcn0_with_firewall.mrglobal_conf.device.nic_raw }},{{ mrzcpd.mcn0_with_firewall.mrglobal_conf.device.nic_raw }} -forward_rule_1=vp,{{ mrzcpd.mcn0_with_firewall.mrglobal_conf.device.nic_raw }},{{ mrzcpd.mcn0_with_firewall.mrglobal_conf.device.nic_raw }} -forward_rule_2=vv,vxlan_fwd,vxlan_user -forward_rule_3=vv,vxlan_user,vxlan_fwd -forward_rule_4=pv,{{ mrzcpd.mcn0_with_firewall.mrglobal_conf.device.nic_mcn1 }},{{ mrzcpd.mcn0_with_firewall.mrglobal_conf.device.nic_mcn1 }} -forward_rule_5=vp,{{ mrzcpd.mcn0_with_firewall.mrglobal_conf.device.nic_mcn1 }},{{ mrzcpd.mcn0_with_firewall.mrglobal_conf.device.nic_mcn1 }} -forward_rule_6=pv,{{ mrzcpd.mcn0_with_firewall.mrglobal_conf.device.nic_mcn2 }},{{ mrzcpd.mcn0_with_firewall.mrglobal_conf.device.nic_mcn2 }} -forward_rule_7=vp,{{ mrzcpd.mcn0_with_firewall.mrglobal_conf.device.nic_mcn2 }},{{ mrzcpd.mcn0_with_firewall.mrglobal_conf.device.nic_mcn2 }} -forward_rule_8=pv,{{ mrzcpd.mcn0_with_firewall.mrglobal_conf.device.nic_mcn3 }},{{ mrzcpd.mcn0_with_firewall.mrglobal_conf.device.nic_mcn3 }} -forward_rule_9=vp,{{ mrzcpd.mcn0_with_firewall.mrglobal_conf.device.nic_mcn3 }},{{ mrzcpd.mcn0_with_firewall.mrglobal_conf.device.nic_mcn3 }} - diff --git a/ansible/roles/mrzcpd/templates/tsg_7400/mrglobal.conf.mcn0.j2.j2 b/ansible/roles/mrzcpd/templates/tsg_7400/mrglobal.conf.mcn0.j2.j2 new file mode 100644 index 00000000..9fa78dfe --- /dev/null +++ b/ansible/roles/mrzcpd/templates/tsg_7400/mrglobal.conf.mcn0.j2.j2 @@ -0,0 +1,78 @@ +[device] +device={{ mrzcpd.mrglobal_conf_mcn0.device.nic_raw }},{{ mrzcpd.mrglobal_conf_mcn0.device.nic_mcn1 }},{{ mrzcpd.mrglobal_conf_mcn0.device.nic_mcn2 }},{{ mrzcpd.mrglobal_conf_mcn0.device.nic_mcn3 }},vxlan_user,vxlan_fwd +sz_tunnel=8192 +sz_buffer=0 + +[device:{{ mrzcpd.mrglobal_conf_mcn0.device.nic_raw }}] +{% raw %} +{% if NPB_device == 'inline_device' %} +in_addr={{inline_device_config.keepalive_ip}} +in_mask={{inline_device_config.keepalive_mask}} +vlan-id-allow=1000,1001,4000,4001 +{% endif %} +{% if NPB_device == 'tera' %} +vlan-id-allow= {{ access_vlan_id_list | join(",") }},4000,4001 +{% endif %} +{% endraw %} +jumbo_frame=1 +max_rx_pkt_len=15360 +clear_tx_flags=1 +vlan-filter=1 +vlan-pvid=0 +vlan-pvid-mode=2 +promisc=1 + +[device:{{ mrzcpd.mrglobal_conf_mcn0.device.nic_mcn1 }}] +jumbo_frame=1 +max_rx_pkt_len=15360 +clear_tx_flags=1 +promisc=1 + +[device:{{ mrzcpd.mrglobal_conf_mcn0.device.nic_mcn2 }}] +jumbo_frame=1 +max_rx_pkt_len=15360 +clear_tx_flags=1 +promisc=1 + +[device:{{ mrzcpd.mrglobal_conf_mcn0.device.nic_mcn3 }}] +jumbo_frame=1 +max_rx_pkt_len=15360 +clear_tx_flags=1 +promisc=1 + +[service] +# lcore id for i/o service, use comma to split +iocore={{ mrzcpd.mrglobal_conf_mcn0.service.iocore }} +distmode=2 +hashmode=0 + +[eal] +virtaddr=0x7f40c4a00000 +loglevel=7 + +[keepalive] +check_spinlock=0 + +[ctrlzone] +ctrlzone0=tunnat,64 + +[pool] +create_mode=3 +sz_direct_pktmbuf=4194304 +sz_indirect_pktmbuf=8192 +sz_cache=256 +sz_data=4096 + +[forward] +nr_forward_rule=10 +forward_rule_0=pv,{{ mrzcpd.mrglobal_conf_mcn0.device.nic_raw }},{{ mrzcpd.mrglobal_conf_mcn0.device.nic_raw }} +forward_rule_1=vp,{{ mrzcpd.mrglobal_conf_mcn0.device.nic_raw }},{{ mrzcpd.mrglobal_conf_mcn0.device.nic_raw }} +forward_rule_2=vv,vxlan_fwd,vxlan_user +forward_rule_3=vv,vxlan_user,vxlan_fwd +forward_rule_4=pv,{{ mrzcpd.mrglobal_conf_mcn0.device.nic_mcn1 }},{{ mrzcpd.mrglobal_conf_mcn0.device.nic_mcn1 }} +forward_rule_5=vp,{{ mrzcpd.mrglobal_conf_mcn0.device.nic_mcn1 }},{{ mrzcpd.mrglobal_conf_mcn0.device.nic_mcn1 }} +forward_rule_6=pv,{{ mrzcpd.mrglobal_conf_mcn0.device.nic_mcn2 }},{{ mrzcpd.mrglobal_conf_mcn0.device.nic_mcn2 }} +forward_rule_7=vp,{{ mrzcpd.mrglobal_conf_mcn0.device.nic_mcn2 }},{{ mrzcpd.mrglobal_conf_mcn0.device.nic_mcn2 }} +forward_rule_8=pv,{{ mrzcpd.mrglobal_conf_mcn0.device.nic_mcn3 }},{{ mrzcpd.mrglobal_conf_mcn0.device.nic_mcn3 }} +forward_rule_9=vp,{{ mrzcpd.mrglobal_conf_mcn0.device.nic_mcn3 }},{{ mrzcpd.mrglobal_conf_mcn0.device.nic_mcn3 }} + diff --git a/ansible/roles/mrzcpd/templates/tsg_7400/mcn123_with_proxy/mrglobal.conf.j2 b/ansible/roles/mrzcpd/templates/tsg_7400/mrglobal.conf.mcn123.j2 similarity index 57% rename from ansible/roles/mrzcpd/templates/tsg_7400/mcn123_with_proxy/mrglobal.conf.j2 rename to ansible/roles/mrzcpd/templates/tsg_7400/mrglobal.conf.mcn123.j2 index eee06fd6..ff1bef13 100644 --- a/ansible/roles/mrzcpd/templates/tsg_7400/mcn123_with_proxy/mrglobal.conf.j2 +++ b/ansible/roles/mrzcpd/templates/tsg_7400/mrglobal.conf.mcn123.j2 @@ -1,16 +1,16 @@ [device] -device={{ mrzcpd.mcn123_with_proxy.mrglobal_conf.device.nic_mirr }} +device={{ mrzcpd.mrglobal_conf_mcn123.device.nic_mirr }} sz_tunnel=8192 sz_buffer=0 -[device:{{ mrzcpd.mcn123_with_proxy.mrglobal_conf.device.nic_mirr }}] +[device:{{ mrzcpd.mrglobal_conf_mcn123.device.nic_mirr }}] jumbo_frame=1 max_rx_pkt_len=15360 clear_tx_flags=1 promisc=1 [service] -iocore={{ mrzcpd.mcn123_with_proxy.mrglobal_conf.service.iocore }} +iocore={{ mrzcpd.mrglobal_conf_mcn123.service.iocore }} [eal] virtaddr=0x7d0000000000