修改mrglobal.conf vlan filter配置

修改部署bug
v20.4.01发布版本
2020-05-08 10:59:24 +08:00 · 2020-05-07 20:55:12 +08:00 · 2020-04-30 22:09:28 +08:00
10 changed files with 24 additions and 6 deletions
--- a/install_config/group_vars/all.yml
+++ b/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:
--- a/roles/firewall/files/ftp-debug-1.0.2.1cddd55-1.el7.centos.x86_64.rpm
+++ b/roles/firewall/files/ftp-debug-1.0.2.1cddd55-1.el7.centos.x86_64.rpm
--- a/roles/firewall/files/fw_http_plug-debug-1.0.8.620f455-1.el7.centos.x86_64.rpm
+++ b/roles/firewall/files/fw_http_plug-debug-1.0.8.620f455-1.el7.centos.x86_64.rpm
--- a/roles/mrzcpd/files/mrzcpd-4.3.18.f543325-1.el7.x86_64.rpm
+++ b/roles/mrzcpd/files/mrzcpd-4.3.18.f543325-1.el7.x86_64.rpm
--- a/roles/mrzcpd/templates/mrglobal.conf.allot_access.j2
+++ b/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
--- a/roles/mrzcpd/templates/mrglobal.conf.inline.j2
+++ b/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
--- a/roles/sapp/files/sapp-4.0.8.fb5bce9-1.el7.x86_64.rpm
+++ b/roles/sapp/files/sapp-4.0.8.fb5bce9-1.el7.x86_64.rpm
--- a/roles/sapp/files/sapp.service
+++ b/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
--- a/roles/sapp/templates/conflist.inf.j2
+++ b/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
--- a/roles/tsg-env-tun-mode/templates/setup.j2
+++ b/roles/tsg-env-tun-mode/templates/setup.j2
@@ -3,3 +3,10 @@ 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
Author	SHA1	Message	Date
zhangzhihan	86c3968c83	修改mrglobal.conf vlan filter配置	2020-05-08 10:59:24 +08:00
zhangzhihan	324fe13b05	修改部署bug	2020-05-07 20:55:12 +08:00
zhangzhihan	41b93a6d31	v20.4.01发布版本	2020-04-30 22:09:28 +08:00