update dpi 20.08

20 files changed, 89 insertions, 7 deletions

diff --git a/install_config/group_vars/all.yml b/install_config/group_vars/all.yml
index bffd0f9..2af7875 100644
--- a/install_config/group_vars/all.yml
+++ b/install_config/group_vars/all.yml
@@ -5,6 +5,14 @@ tsg_access_type: 4
 #####0: Tun_mode;  1: normal; 2: ADC;
 tsg_running_type: 1 
 
+#Common combination mode:
+#1:Server or PC tun mode:      0 + 0
+#2:Server with Inline device:  1 + 1
+#3:ADC with Inline device:     1 + 2
+#4:ADC with Allot:             2 + 2
+#5:ADC tun mode:               3 + 1
+#6:ATCA:                       4 + 1
+
 ########################################
 maat_redis_server:
   address: "192.168.40.168"
@@ -69,6 +77,7 @@ mrzcpd:
 mrtunnat:
   lcore_id: 38
 
+#############ATCA config################
 nic_data_incoming:
   ethname: enp1s0
   vf0_name: enp1s2
@@ -80,10 +89,13 @@ VlanFlipping:
   vlanID_2: 101
   vlanID_3: 103
   vlanID_4: 104
-########################################
+
+#############Server or PC tun mode######
 server:
   ethname: eth0
   tun_name: eth0.100
   internal_interface: "eth2"
   external_interface: "eth3"
 
+
+
diff --git a/roles/certstore/files/certstore-2.1.2.20200728.7515a19-1.el7.x86_64.rpm b/roles/certstore/files/certstore-2.1.2.20200728.7515a19-1.el7.x86_64.rpm
deleted file mode 100644
index aaecaa9..0000000
--- a/roles/certstore/files/certstore-2.1.2.20200728.7515a19-1.el7.x86_64.rpm
+++ /dev/null
diff --git a/roles/certstore/files/certstore-2.1.2.20200828.f507b3e-1.el7.x86_64.rpm b/roles/certstore/files/certstore-2.1.2.20200828.f507b3e-1.el7.x86_64.rpm
new file mode 100644
index 0000000..bb18166
--- /dev/null
+++ b/roles/certstore/files/certstore-2.1.2.20200828.f507b3e-1.el7.x86_64.rpm
diff --git a/roles/certstore/tasks/main.yml b/roles/certstore/tasks/main.yml
index b322fea..5d9b7af 100644
--- a/roles/certstore/tasks/main.yml
+++ b/roles/certstore/tasks/main.yml
@@ -10,7 +10,7 @@
 - name: install certstore
   yum:
     name:
-      - /tmp/ansible_deploy/certstore-2.1.2.20200728.7515a19-1.el7.x86_64.rpm
+      - /tmp/ansible_deploy/certstore-2.1.2.20200828.f507b3e-1.el7.x86_64.rpm
     state: present
 
 - name: template certstore configure file
diff --git a/roles/firewall/files/tsg_conn_record-1.0.0.2155660-1.el7.centos.x86_64.rpm b/roles/firewall/files/tsg_conn_record-1.0.0.2155660-1.el7.centos.x86_64.rpm
deleted file mode 100644
index 37745d0..0000000
--- a/roles/firewall/files/tsg_conn_record-1.0.0.2155660-1.el7.centos.x86_64.rpm
+++ /dev/null
diff --git a/roles/firewall/files/tsg_conn_record-1.0.2.2afb19a-2.el7.x86_64.rpm b/roles/firewall/files/tsg_conn_record-1.0.2.2afb19a-2.el7.x86_64.rpm
new file mode 100644
index 0000000..1251601
--- /dev/null
+++ b/roles/firewall/files/tsg_conn_record-1.0.2.2afb19a-2.el7.x86_64.rpm
diff --git a/roles/firewall/tasks/main.yml b/roles/firewall/tasks/main.yml
index 7144fe8..0293ab7 100644
--- a/roles/firewall/tasks/main.yml
+++ b/roles/firewall/tasks/main.yml
@@ -25,7 +25,7 @@
       - /tmp/ansible_deploy/mail-1.0.7.9e3be05-2.el7.x86_64.rpm
       - /tmp/ansible_deploy/quic-1.1.6.d6755d8-2.el7.x86_64.rpm
       - /tmp/ansible_deploy/ssl-1.0.3.e8482a4-2.el7.x86_64.rpm
-      - /tmp/ansible_deploy/tsg_conn_record-1.0.0.2155660-1.el7.centos.x86_64.rpm
+      - /tmp/ansible_deploy/tsg_conn_record-1.0.2.2afb19a-2.el7.x86_64.rpm
       - /tmp/ansible_deploy/tsg_conn_sketch-2.0.v2.0_alpha.af621ca-2.el7.x86_64.rpm
 
 - name: "Template the tsgconf/main.conf"
diff --git a/roles/framework/files/libmaatframe-3.0.2.dc1fced-2.el7.x86_64.rpm b/roles/framework/files/libmaatframe-3.0.2.dc1fced-2.el7.x86_64.rpm
deleted file mode 100644
index 8bacf7c..0000000
--- a/roles/framework/files/libmaatframe-3.0.2.dc1fced-2.el7.x86_64.rpm
+++ /dev/null
diff --git a/roles/framework/files/libmaatframe-3.0.3.5931b44-2.el7.x86_64.rpm b/roles/framework/files/libmaatframe-3.0.3.5931b44-2.el7.x86_64.rpm
new file mode 100644
index 0000000..23f3990
--- /dev/null
+++ b/roles/framework/files/libmaatframe-3.0.3.5931b44-2.el7.x86_64.rpm
diff --git a/roles/framework/tasks/main.yml b/roles/framework/tasks/main.yml
index f6f1ea4..beafcd5 100644
--- a/roles/framework/tasks/main.yml
+++ b/roles/framework/tasks/main.yml
@@ -18,7 +18,7 @@
       - /tmp/ansible_deploy/libWiredLB-2.0.3.c7d131b-1.el7.x86_64.rpm
       - /tmp/ansible_deploy/libcjson-1.7.8.542ad7f-1.el7.x86_64.rpm
       - /tmp/ansible_deploy/libdocumentanalyze-2.0.4.efdfc29-1.el7.x86_64.rpm
-      - /tmp/ansible_deploy/libmaatframe-3.0.2.dc1fced-2.el7.x86_64.rpm
+      - /tmp/ansible_deploy/libmaatframe-3.0.3.5931b44-2.el7.x86_64.rpm
       - /tmp/ansible_deploy/librulescan-2.2.0.900d2b3-2.el7.x86_64.rpm
       - /tmp/ansible_deploy/libwiredcfg-2.0.2.7ce1eea-1.el7.x86_64.rpm
       - /tmp/ansible_deploy/lz4-1.7.5-3.el7.x86_64.rpm
diff --git a/roles/mrzcpd/templates/mrglobal.conf.server_inline.j2 b/roles/mrzcpd/templates/mrglobal.conf.server_inline.j2
new file mode 100644
index 0000000..fb4aa35
--- /dev/null
+++ b/roles/mrzcpd/templates/mrglobal.conf.server_inline.j2
@@ -0,0 +1,70 @@
+[device]
+device={{nic_data_incoming.name}},{{nic_to_tfe.tfe0.name}},{{nic_to_tfe.tfe1.name}},{{nic_to_tfe.tfe2.name}},vxlan_user,vxlan_fwd
+sz_tunnel=8192
+sz_buffer=0
+
+[device:{{nic_data_incoming.name}}]
+in_addr={{nic_data_incoming.ip}}
+in_mask={{nic_data_incoming.mask}}
+gateway={{nic_data_incoming.gw}}
+jumbo_frame=1
+max_rx_pkt_len=15360
+clear_tx_flags=1
+#vlan-filter=1
+#vlan-id-allow=1301,1302,2301,2302,1501,1502,2501,2502,1601,1602,2601,2602,1701,1702,2701,2702,1801,1802,2801,2802,1901,1902,2901,2902
+#vlan-pvid=0
+#vlan-pvid-mode=0
+
+[device:{{nic_to_tfe.tfe0.name}}]
+jumbo_frame=1
+max_rx_pkt_len=15360
+clear_tx_flags=1
+promisc=1
+
+[device:{{nic_to_tfe.tfe1.name}}]
+jumbo_frame=1
+max_rx_pkt_len=15360
+clear_tx_flags=1
+promisc=1
+
+[device:{{nic_to_tfe.tfe2.name}}]
+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.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,{{nic_data_incoming.name}},{{nic_data_incoming.name}}
+forward_rule_1=vp,{{nic_data_incoming.name}},{{nic_data_incoming.name}}
+forward_rule_2=vv,vxlan_fwd,vxlan_user
+forward_rule_3=vv,vxlan_user,vxlan_fwd
+forward_rule_4=pv,{{nic_to_tfe.tfe0.name}},{{nic_to_tfe.tfe0.name}}
+forward_rule_5=vp,{{nic_to_tfe.tfe0.name}},{{nic_to_tfe.tfe0.name}}
+forward_rule_6=pv,{{nic_to_tfe.tfe1.name}},{{nic_to_tfe.tfe1.name}}
+forward_rule_7=vp,{{nic_to_tfe.tfe1.name}},{{nic_to_tfe.tfe1.name}}
+forward_rule_8=pv,{{nic_to_tfe.tfe2.name}},{{nic_to_tfe.tfe2.name}}
+forward_rule_9=vp,{{nic_to_tfe.tfe2.name}},{{nic_to_tfe.tfe2.name}}
diff --git a/roles/sapp/files/sapp-4.0.18.bb2effd-x86_64...rpm b/roles/sapp/files/sapp-4.0.18.bb2effd-x86_64...rpm
deleted file mode 100755
index 5b3893b..0000000
--- a/roles/sapp/files/sapp-4.0.18.bb2effd-x86_64...rpm
+++ /dev/null
diff --git a/roles/sapp/files/sapp-4.0.20.b59c12a-2.el7.x86_64.rpm b/roles/sapp/files/sapp-4.0.20.b59c12a-2.el7.x86_64.rpm
new file mode 100644
index 0000000..24e21af
--- /dev/null
+++ b/roles/sapp/files/sapp-4.0.20.b59c12a-2.el7.x86_64.rpm
diff --git a/roles/sapp/tasks/main.yml b/roles/sapp/tasks/main.yml
index 36aa5b5..64ffe65 100644
--- a/roles/sapp/tasks/main.yml
+++ b/roles/sapp/tasks/main.yml
@@ -7,7 +7,7 @@
 - name: "install sapp rpms from localhost"
   yum:
     name:
-      - /tmp/ansible_deploy/sapp-4.0.18.bb2effd-x86_64...rpm
+      - /tmp/ansible_deploy/sapp-4.0.20.b59c12a-2.el7.x86_64.rpm
     state: present
     skip_broken: yes
 
diff --git a/roles/tfe/files/tfe-4.3.7.39bff00-1.el7.x86_64.rpm b/roles/tfe/files/tfe-4.3.7.39bff00-1.el7.x86_64.rpm
deleted file mode 100644
index 9aecf93..0000000
--- a/roles/tfe/files/tfe-4.3.7.39bff00-1.el7.x86_64.rpm
+++ /dev/null
diff --git a/roles/tfe/files/tfe-4.3.9.4d7957e-1.el7.x86_64.rpm b/roles/tfe/files/tfe-4.3.9.4d7957e-1.el7.x86_64.rpm
new file mode 100644
index 0000000..634b2e5
--- /dev/null
+++ b/roles/tfe/files/tfe-4.3.9.4d7957e-1.el7.x86_64.rpm
diff --git a/roles/tfe/tasks/main.yml b/roles/tfe/tasks/main.yml
index 64af311..d702f76 100644
--- a/roles/tfe/tasks/main.yml
+++ b/roles/tfe/tasks/main.yml
@@ -14,7 +14,7 @@
   yum:
     name:
       - /tmp/ansible_deploy/tfe-kmod-v1.0.5.20200408-1dkms.noarch.rpm
-      - /tmp/ansible_deploy/tfe-4.3.7.39bff00-1.el7.x86_64.rpm
+      - /tmp/ansible_deploy/tfe-4.3.9.4d7957e-1.el7.x86_64.rpm
     state: present
 
 - name: "template tfe-env config"
diff --git a/roles/tsg_master/files/tsg_master-3.0.4.40fa047-2.el7.x86_64.rpm b/roles/tsg_master/files/tsg_master-3.0.4.40fa047-2.el7.x86_64.rpm
deleted file mode 100644
index 0a46aef..0000000
--- a/roles/tsg_master/files/tsg_master-3.0.4.40fa047-2.el7.x86_64.rpm
+++ /dev/null
diff --git a/roles/tsg_master/files/tsg_master-3.1.2.7002e1b-2.el7.x86_64.rpm b/roles/tsg_master/files/tsg_master-3.1.2.7002e1b-2.el7.x86_64.rpm
new file mode 100644
index 0000000..afd1fc3
--- /dev/null
+++ b/roles/tsg_master/files/tsg_master-3.1.2.7002e1b-2.el7.x86_64.rpm
diff --git a/roles/tsg_master/tasks/main.yml b/roles/tsg_master/tasks/main.yml
index f49ce64..ff68425 100644
--- a/roles/tsg_master/tasks/main.yml
+++ b/roles/tsg_master/tasks/main.yml
@@ -6,6 +6,6 @@
 - name: "install tsg_master from localhost"
   yum:
     name:
-      - /tmp/ansible_deploy/tsg_master-3.0.4.40fa047-2.el7.x86_64.rpm
+      - /tmp/ansible_deploy/tsg_master-3.1.2.7002e1b-2.el7.x86_64.rpm
     state: present
     skip_broken: yes