diff --git a/tsg-9140-scripts/roles/mrzcpd/files/mrzcpd-4.3.30.4627eb7-1.el7.x86_64.rpm b/tsg-9140-scripts/roles/mrzcpd/files/mrzcpd-4.4.0.21fa879-1.el7.x86_64.rpm similarity index 63% rename from tsg-9140-scripts/roles/mrzcpd/files/mrzcpd-4.3.30.4627eb7-1.el7.x86_64.rpm rename to tsg-9140-scripts/roles/mrzcpd/files/mrzcpd-4.4.0.21fa879-1.el7.x86_64.rpm index 9d2dd378..5cb40c11 100644 Binary files a/tsg-9140-scripts/roles/mrzcpd/files/mrzcpd-4.3.30.4627eb7-1.el7.x86_64.rpm and b/tsg-9140-scripts/roles/mrzcpd/files/mrzcpd-4.4.0.21fa879-1.el7.x86_64.rpm differ diff --git a/tsg-9140-scripts/roles/mrzcpd/tasks/main.yml b/tsg-9140-scripts/roles/mrzcpd/tasks/main.yml index adc7b9d2..79005105 100644 --- a/tsg-9140-scripts/roles/mrzcpd/tasks/main.yml +++ b/tsg-9140-scripts/roles/mrzcpd/tasks/main.yml @@ -6,7 +6,7 @@ - name: "install mrzcpd" yum: - name: /tmp/ansible_deploy/mrzcpd-4.3.30.4627eb7-1.el7.x86_64.rpm + name: /tmp/ansible_deploy/mrzcpd-4.4.0.21fa879-1.el7.x86_64.rpm state: present - name: "update sysconfig/mrzcpd" @@ -19,16 +19,6 @@ src: "{{ role_path }}/templates/tsg_9140/mrglobal.conf.tsg_9140.j2" dest: /opt/mrzcpd/etc/mrglobal.conf -- name: "copy mrapp.sapp4.conf to destination server" - template: - src: "{{ role_path }}/templates/mrapp.sapp4.conf" - dest: /opt/mrzcpd/etc/mrapp.sapp4.conf - -- name: "update mrtunnat.conf.adc_inline" - template: - src: "{{ role_path }}/templates/tsg_9140/mrtunnat.conf.tsg_9140.j2" - dest: /opt/mrzcpd/etc/mrtunnat.conf - #- name: "enable mrenv" # systemd: # name: mrenv diff --git a/tsg-9140-scripts/roles/mrzcpd/templates/mrapp.sapp4.conf b/tsg-9140-scripts/roles/mrzcpd/templates/mrapp.sapp4.conf deleted file mode 100644 index 6f6c9445..00000000 --- a/tsg-9140-scripts/roles/mrzcpd/templates/mrapp.sapp4.conf +++ /dev/null @@ -1,2 +0,0 @@ -[bpfdump:vxlan_user] -enable=1 diff --git a/tsg-9140-scripts/roles/mrzcpd/templates/mrzcpd.j2 b/tsg-9140-scripts/roles/mrzcpd/templates/mrzcpd.j2 index 192a4004..a5dbe674 100644 --- a/tsg-9140-scripts/roles/mrzcpd/templates/mrzcpd.j2 +++ b/tsg-9140-scripts/roles/mrzcpd/templates/mrzcpd.j2 @@ -1,3 +1,3 @@ MRZCPD_ROOT=/opt/mrzcpd HUGEPAGE_NUM_2M=16384 -DEFAULT_UIO_MODULE="igb_uio" \ No newline at end of file +DEFAULT_UIO_MODULE="vfio_pci" \ No newline at end of file diff --git a/tsg-9140-scripts/roles/mrzcpd/templates/tsg_9140/mrtunnat.conf.tsg_9140.j2 b/tsg-9140-scripts/roles/mrzcpd/templates/tsg_9140/mrtunnat.conf.tsg_9140.j2 deleted file mode 100644 index dfddef51..00000000 --- a/tsg-9140-scripts/roles/mrzcpd/templates/tsg_9140/mrtunnat.conf.tsg_9140.j2 +++ /dev/null @@ -1,20 +0,0 @@ -[tunnat] -lcore_id=38 -appsym=tunnat -phydev=enp130s2 -virtdev=vxlan_fwd -nr_max_sessions=524280 -nr_slots=1048576 -expire_time=60 -reverse_tunnel=0 -use_recent_tunnel=0 -use_link_info_table=1 -use_tuple4_as_sskey=0 -ctrlzone_addr_info_type=2 -idle_threshold=10000 - -[vlan_flipping] -enable=0 -c_router_vlan_id_0=1000 -i_router_vlan_id_0=1001 -en_mac_flipping_0=0 \ No newline at end of file