更新mrglobal.conf vlan filter

install_config/group_vars/all.yml

@@ -13,7 +13,7 @@ dynamic_maat_redis_server:
   db: 0
 
 cert_store_server:
-  address: "127.0.0.1"
+  address: "192.168.100.1"
   port: 9991
 
 log_kafkabrokers:
@@ -25,8 +25,8 @@ log_minio:
 
 fs_remote:
   switch: 1
-  address: "127.0.0.1"
+  address: "192.168.100.1"
-  port: 8125
+  port: 58125
   
 ########################################
 sapp:

roles/firewall/tasks/main.yml

@@ -18,9 +18,9 @@
       - /tmp/ansible_deploy/tsg_conn_record-1.0.0.2155660-1.el7.centos.x86_64.rpm
       - /tmp/ansible_deploy/fw_dns_plug-debug-1.0.3.ea8e0f6-1.el7.centos.x86_64.rpm
       - /tmp/ansible_deploy/fw_ftp_plug-debug-1.0.1.a5c1e05-1.el7.centos.x86_64.rpm
-      - /tmp/ansible_deploy/fw_http_plug-debug-1.0.8.620f455-1.el7.centos.x86_64.rpm
+      - /tmp/ansible_deploy/fw_ssl_plug-1.0.0.-1.el7.x86_64.rpm
-      - /tmp/ansible_deploy/fw_mail_plug-debug-1.0.2.f513698-1.el7.centos.x86_64.rpm
+      - /tmp/ansible_deploy/fw_mail_plug-debug-1.0.0.-1.el7.x86_64.rpm
-      - /tmp/ansible_deploy/fw_ssl_plug-1.0.1.d232f96-1.el7.centos.x86_64.rpm
+      - /tmp/ansible_deploy/fw_http_plug-debug-1.0.0.-1.el7.x86_64.rpm
       - /tmp/ansible_deploy/capture_packet_plug-debug-1.0.0.-1.el7.x86_64.rpm
       - /tmp/ansible_deploy/clotho-debug-1.0.0.-1.el7.x86_64.rpm
 

roles/mrzcpd/templates/mrglobal.conf.allot_access.j2

@@ -7,7 +7,7 @@ sz_buffer=0
 jumbo_frame=1
 max_rx_pkt_len=15360
 clear_tx_flags=1
-vlan-filter=0
+vlan-filter=1
 vlan-id-allow={{ AllotAccess.virturlID_1 }},{{ AllotAccess.virturlID_2 }}
 vlan-pvid=0
 vlan-pvid-mode=2

roles/mrzcpd/templates/mrglobal.conf.inline.j2

@@ -22,7 +22,7 @@ clear_tx_flags=1
 #vlan-pvid=0
 #vlan-pvid-mode=0
 {% else %}
-vlan-filter=1
+vlan-filter=0
 vlan-id-allow=3811,3812,3813,3814,3821,3822,3823,3824,3831,3832,3833,3834,3841,3842,3843,3844
 vlan-pvid=0
 vlan-pvid-mode=0

roles/sapp/files/sapp.service

@@ -0,0 +1,11 @@
+[Unit]
+Description=sapp service
+Requires=mrzcpd.service
+After=mrzcpd.service
+[Service]
+WorkingDirectory=/home/mesasoft/sapp_run
+ExecStart=/home/mesasoft/sapp_run/sapp
+Restart=always
+RestartSec=5s
+[Install]
+WantedBy=multi-user.target

roles/sapp/tasks/main.yml

@@ -8,7 +8,7 @@
   yum:
     name:
     #  - /tmp/ansible_deploy/sapp-4.0.11.347f7b7-x86_64.rpm
-      - /tmp/ansible_deploy/tsg_master-debug-1.0.3.a4e2a7c-1.el7.centos.x86_64.rpm
+      - /tmp/ansible_deploy/tsg_master-debug-1.0.0.-1.el7.x86_64.rpm
     state: present
 
 - name: "judge sapp"

roles/sapp/templates/conflist.inf.j2

@@ -20,7 +20,7 @@
 
 [business]
 ./plug/business/kni/kni.inf
-./plug/business/fw_ssl/fw_ssl.inf
+./plug/business/fw_ssl_plug/fw_ssl_plug.inf
 ./plug/business/fw_http_plug/fw_http_plug.inf
 ./plug/business/fw_dns_plug/fw_dns_plug.inf
 ./plug/business/fw_mail_plug/fw_mail_plug.inf

roles/tfe/tasks/main.yml

@@ -8,7 +8,7 @@
   yum:
     name:
       - /tmp/ansible_deploy/tfe-kmod-v1.0.5.20200408-1dkms.noarch.rpm
-      - /tmp/ansible_deploy/tfe-4.3.1.cc89b5b-1.el7.x86_64.rpm
+      - /tmp/ansible_deploy/tfe-4.3.1.202004291711100800.374930d-1.el7.x86_64.rpm
     state: present
 
 - name: "template tfe-env config"

roles/tsg-env-tun-mode/templates/setup.j2

@@ -3,3 +3,9 @@ modprobe 8021q
 vconfig add {{ nic_mgr.name }} 100
 vconfig set_flag {{ nic_mgr.name }}.100 1 1
 ifconfig {{ nic_mgr.name }}.100 192.168.100.1 netmask 255.255.255.0 up
+ethtool -K {{ nic_transparent_mode.internel_interface }} tso off
+ethtool -K {{ nic_transparent_mode.internel_interface }} gso off
+ethtool -K {{ nic_transparent_mode.internel_interface }} gro off
+ethtool -K {{ nic_transparent_mode.externel_interface }} tso off
+ethtool -K {{ nic_transparent_mode.externel_interface }} gso off
+ethtool -K {{ nic_transparent_mode.externel_interface }} gro off