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 dd970e65..65c886c6 100644 --- a/ansible/install_config/group_vars/stage_one_tsg_7400.yml +++ b/ansible/install_config/group_vars/stage_one_tsg_7400.yml @@ -26,4 +26,21 @@ kni: tfe_cmsg_receiver: listen_eth: eth_pf.100 watch_dog: - listen_eth: eth_pf.100 \ No newline at end of file + 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 diff --git a/ansible/install_config/group_vars/stage_one_tsg_9140.yml b/ansible/install_config/group_vars/stage_one_tsg_9140.yml index de461541..a9674763 100644 --- a/ansible/install_config/group_vars/stage_one_tsg_9140.yml +++ b/ansible/install_config/group_vars/stage_one_tsg_9140.yml @@ -20,4 +20,12 @@ kni: tfe_cmsg_receiver: listen_eth: lo watch_dog: - listen_eth: lo \ No newline at end of file + listen_eth: lo + +mrzcpd: + mrglobal_conf: + device: + nic_raw: enp1s2 + nic_to_tfe: enp130s2 + service: + iocore: 52,53,54,55 \ No newline at end of file diff --git a/ansible/roles/mrzcpd/tasks/main.yml b/ansible/roles/mrzcpd/tasks/main.yml index adbc348f..684813d7 100644 --- a/ansible/roles/mrzcpd/tasks/main.yml +++ b/ansible/roles/mrzcpd/tasks/main.yml @@ -12,7 +12,7 @@ - name: "update mrglobal.conf - TSG9140" template: - src: "{{ role_path }}/templates/tsg_9140/mrglobal.conf.tsg_9140.j2.j2" + src: "{{ role_path }}/templates/tsg_9140/mrglobal.conf.j2.j2" dest: /opt/tsg/tsg-os-provision/templates/mrglobal.conf.j2 when: - PROFILE_ID == '9000-NPB-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 index 6d4dae96..478319cb 100644 --- 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 @@ -1,10 +1,9 @@ [device] -device=eth_raw,eth_mcn1,eth_mcn2,eth_mcn3,vxlan_user,vxlan_fwd +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:eth_raw] - +[device:{{ mrzcpd.mcn0_with_firewall.mrglobal_conf.device.nic_raw }}] {% raw %} {% if NPB_device == 'inline_device' %} in_addr={{inline_device_config.keepalive_ip}} @@ -23,19 +22,19 @@ vlan-pvid=0 vlan-pvid-mode=2 promisc=1 -[device:eth_mcn1] +[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:eth_mcn2] +[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:eth_mcn3] +[device:{{ mrzcpd.mcn0_with_firewall.mrglobal_conf.device.nic_mcn3 }}] jumbo_frame=1 max_rx_pkt_len=15360 clear_tx_flags=1 @@ -43,7 +42,7 @@ promisc=1 [service] # lcore id for i/o service, use comma to split -iocore=52,53,54,55 +iocore={{ mrzcpd.mcn0_with_firewall.mrglobal_conf.service.iocore }} distmode=2 hashmode=0 @@ -66,14 +65,14 @@ sz_data=4096 [forward] nr_forward_rule=10 -forward_rule_0=pv,eth_raw,eth_raw -forward_rule_1=vp,eth_raw,eth_raw +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,eth_mcn1,eth_mcn1 -forward_rule_5=vp,eth_mcn1,eth_mcn1 -forward_rule_6=pv,eth_mcn2,eth_mcn2 -forward_rule_7=vp,eth_mcn2,eth_mcn2 -forward_rule_8=pv,eth_mcn3,eth_mcn3 -forward_rule_9=vp,eth_mcn3,eth_mcn3 +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/mcn123_with_proxy/mrglobal.conf.j2 b/ansible/roles/mrzcpd/templates/tsg_7400/mcn123_with_proxy/mrglobal.conf.j2 index f35bbf01..eee06fd6 100644 --- a/ansible/roles/mrzcpd/templates/tsg_7400/mcn123_with_proxy/mrglobal.conf.j2 +++ b/ansible/roles/mrzcpd/templates/tsg_7400/mcn123_with_proxy/mrglobal.conf.j2 @@ -1,16 +1,16 @@ [device] -device=eth_mirr_d +device={{ mrzcpd.mcn123_with_proxy.mrglobal_conf.device.nic_mirr }} sz_tunnel=8192 sz_buffer=0 -[device:eth_mirr_d] +[device:{{ mrzcpd.mcn123_with_proxy.mrglobal_conf.device.nic_mirr }}] jumbo_frame=1 max_rx_pkt_len=15360 clear_tx_flags=1 promisc=1 [service] -iocore=53,54 +iocore={{ mrzcpd.mcn123_with_proxy.mrglobal_conf.service.iocore }} [eal] virtaddr=0x7d0000000000 diff --git a/ansible/roles/mrzcpd/templates/tsg_9140/mrglobal.conf.tsg_9140.j2.j2 b/ansible/roles/mrzcpd/templates/tsg_9140/mrglobal.conf.j2.j2 similarity index 52% rename from ansible/roles/mrzcpd/templates/tsg_9140/mrglobal.conf.tsg_9140.j2.j2 rename to ansible/roles/mrzcpd/templates/tsg_9140/mrglobal.conf.j2.j2 index 91aeede8..57582606 100644 --- a/ansible/roles/mrzcpd/templates/tsg_9140/mrglobal.conf.tsg_9140.j2.j2 +++ b/ansible/roles/mrzcpd/templates/tsg_9140/mrglobal.conf.j2.j2 @@ -1,9 +1,9 @@ [device] -device=enp1s2,enp130s2,vxlan_user,vxlan_fwd +device={{ mrzcpd.mrglobal_conf.device.nic_raw }},{{ mrzcpd.mrglobal_conf.device.nic_to_tfe }},vxlan_user,vxlan_fwd sz_tunnel=8192 sz_buffer=0 -[device:enp1s2] +[device:{{ mrzcpd.mrglobal_conf.device.nic_raw }}] mtu=4096 clear_tx_flags=1 hw_strip_crc=1 @@ -14,7 +14,7 @@ in_addr=10.253.{{ keepalive_subnet_ip }}.1 in_mask=255.255.0.0 rssmode=0 -[device:enp130s2] +[device:{{ mrzcpd.mrglobal_conf.device.nic_to_tfe }}] mtu=4096 clear_tx_flags=1 vlan-filter=1 @@ -29,7 +29,7 @@ rssmode=0 [service] # lcore id for i/o service, use comma to split -iocore=55,54,53,52 +iocore={{ mrzcpd.mrglobal_conf.service.iocore }} distmode=2 hashmode=0 idle_threshold=10000 @@ -53,9 +53,9 @@ sz_data=4096 [forward] nr_forward_rule=6 -forward_rule_0=pv,enp1s2,enp1s2 -forward_rule_1=vp,enp1s2,enp1s2 +forward_rule_0=pv,{{ mrzcpd.mrglobal_conf.device.nic_raw }},{{ mrzcpd.mrglobal_conf.device.nic_raw }} +forward_rule_1=vp,{{ mrzcpd.mrglobal_conf.device.nic_raw }},{{ mrzcpd.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,enp130s2,enp130s2 -forward_rule_5=vp,enp130s2,enp130s2 \ No newline at end of file +forward_rule_4=pv,{{ mrzcpd.mrglobal_conf.device.nic_to_tfe }},{{ mrzcpd.mrglobal_conf.device.nic_to_tfe }} +forward_rule_5=vp,{{ mrzcpd.mrglobal_conf.device.nic_to_tfe }},{{ mrzcpd.mrglobal_conf.device.nic_to_tfe }} \ No newline at end of file