bugfix:增加部署过程中漏掉的ssl，fw_ssl_plug和修改部署过程中出现的错误

adc_deploy.yml

@@ -73,8 +73,8 @@
     - {role: kernel-ml, tags: kernel-ml}
     - {role: mrzcpd, tags: mrzcpd}
     - {role: tfe, tags: tfe}
-#    - {role: adc_exporter, tags: adc_exporter}
+    - {role: adc_exporter, tags: adc_exporter}
-    - {role: switch_control, tags: switch_control}
+#    - {role: switch_control, tags: switch_control}
     - {role: tsg-env-patch, tags: tsg-env-patch}
     - {role: tsg-diagnose_sync_ca, tags: tsg-diagnose_sync_ca}
 

install_config/group_vars/adc_global.yml

@@ -1,7 +1,7 @@
 #########################################
-#####1: Inline_device;  2: Allot;  3: ADC_Tun_mode;
+#####0: pcap; 1: Inline_device; 2: Allot;  3: ADC_Tun_mode;  4:ATCA_Vlan_Flipping 5:ATCA_VXLAN
 tsg_access_type: 2
-#####2: ADC;
+#####2: ADC;  0:Tun_mode; 1: normal;
 tsg_running_type: 2
 #####deploy mode: cluster, single
 deploy_mode: "cluster"

roles/docker-env/files/daemon.json

@@ -0,0 +1 @@
+{"iptables":false,"bridge": "none"}

roles/docker-env/tasks/docker-ce.yml

@@ -30,6 +30,11 @@
       - /tmp/ansible_deploy/docker-ce/libsemanage-2.5-14.el7.x86_64.rpm
     state: present
 
+- name: "docker-ce: copy daemon.json to target"
+  copy:
+    src: '{{ role_path }}/files/daemon.json'
+    dest: /etc/docker/
+
 - name: "docker-ce: systemctl start docker and enabled docker"
   systemd:
     name: docker

roles/firewall/tasks/main.yml

@@ -17,19 +17,21 @@
       - /tmp/ansible_deploy/ftp-1.0.8.13d5fda-2.el7.x86_64.rpm
       - /tmp/ansible_deploy/fw_dns_plug-3.0.5.2a25c20-2.el7.x86_64.rpm
       - /tmp/ansible_deploy/fw_ftp_plug-3.0.1.0a78573-2.el7.x86_64.rpm
-      - /tmp/ansible_deploy/fw_http_plug-3.1.11.b0f7b8f-2.el7.x86_64.rpm
+      - /tmp/ansible_deploy/fw_http_plug-3.2.3.6b8c95d-2.el7.x86_64.rpm
-      - /tmp/ansible_deploy/fw_mail_plug-3.0.9.d496513-2.el7.x86_64.rpm
+      - /tmp/ansible_deploy/fw_mail_plug-3.1.1.777fa90-2.el7.x86_64.rpm
       - /tmp/ansible_deploy/fw_quic_plug-3.0.4.947ef77-2.el7.x86_64.rpm
-      - /tmp/ansible_deploy/fw_ssl_plug-3.0.6.a121701-2.el7.x86_64.rpm
+      - /tmp/ansible_deploy/fw_ssl_plug-3.1.0.10d88fa-2.el7.x86_64.rpm
       - /tmp/ansible_deploy/http-2.0.5.c61ad9a-2.el7.x86_64.rpm
       - /tmp/ansible_deploy/mail-1.0.9.c1d3bde-2.el7.x86_64.rpm
       - /tmp/ansible_deploy/quic-1.1.17.8c22b4d-2.el7.x86_64.rpm
-      - /tmp/ansible_deploy/ssl-1.0.12.16b8fb5-2.el7.x86_64.rpm
+      - /tmp/ansible_deploy/ssl-2.0.0.eaa9479-2.el7.x86_64.rpm
-      - /tmp/ansible_deploy/tsg_conn_sketch-2.1.16.7b1b2d5-2.el7.x86_64.rpm
+      - /tmp/ansible_deploy/tsg_conn_sketch-2.1.33.68c9aaf-2.el7.x86_64.rpm
       - /tmp/ansible_deploy/rtp-1.0.4.91b4ab7-2.el7.x86_64.rpm
-      - /tmp/ansible_deploy/mesa_sip-1.0.15.77d2f1a-2.el7.x86_64.rpm
+      - /tmp/ansible_deploy/mesa_sip-1.1.0.cfebc76-2.el7.x86_64.rpm
       - /tmp/ansible_deploy/fw_voip_plug-1.0.6.341fe83-2.el7.x86_64.rpm
-      - /tmp/ansible_deploy/app_proto_identify-1.0.10.1eeff1d-2.el7.x86_64.rpm
+      - /tmp/ansible_deploy/app_proto_identify-2.0.1.dd683eb-2.el7.x86_64.rpm
+      - /tmp/ansible_deploy/gtp-1.0.4.8804e43-2.el7.x86_64.rpm
+      - /tmp/ansible_deploy/gtp_signaling_plug-1.0.1.6e51cc4-2.el7.x86_64.rpm
 
 - name: "Template the tsgconf/main.conf"
   template:

roles/firewall/templates/main.conf.j2

@@ -86,7 +86,6 @@ hos_fs2_serverport={{ firewall.hos_fs2_serverport }}
 [APP_SKETCH_LOCAL]
 LOG_LEVEL={{ firewall.APP_SKETCH_LOG_LEVEL }}
 LOG_PATH="{{ firewall.APP_SKETCH_LOG_PATH }}"
-L7_PROTOCOL_LABEL="{{ firewall.APP_SKETCH_L7_PROTOCOL_LABEL }}"
 
 [APP_SKETCH_FEEDBACK]
 QOS={{ firewall.APP_SKETCH_QOS }}

roles/framework/tasks/main.yml

@@ -12,14 +12,14 @@
     packages:
       - /tmp/ansible_deploy/libcjson-1.7.10.ab2896f-2.el7.x86_64.rpm
       - /tmp/ansible_deploy/libdocumentanalyze-2.0.6.2d1abe0-2.el7.x86_64.rpm
-      - /tmp/ansible_deploy/libmaatframe-3.1.19.66c294f-2.el7.x86_64.rpm
+      - /tmp/ansible_deploy/libmaatframe-3.1.22.3.1.22.3.1.22.6b91622-2.el7.x86_64.rpm
       - /tmp/ansible_deploy/libMESA_field_stat-1.0.2.6d45eed-2.el7.x86_64.rpm
       - /tmp/ansible_deploy/libMESA_field_stat2-2.9.10.72ac4f1-2.el7.x86_64.rpm
       - /tmp/ansible_deploy/libMESA_handle_logger-2.0.7.cb4ad71-2.el7.x86_64.rpm
       - /tmp/ansible_deploy/libMESA_htable-3.10.12.cf4ccfc-2.el7.x86_64.rpm
       - /tmp/ansible_deploy/libMESA_prof_load-1.0.6.c6da36a-2.el7.x86_64.rpm
       - /tmp/ansible_deploy/librdkafka-0.11.4-1.el7.x86_64.rpm
-      - /tmp/ansible_deploy/librulescan-2.2.2.e5a4457-2.el7.x86_64.rpm
+      - /tmp/ansible_deploy/librulescan-2.2.3.93a68a2-2.el7.x86_64.rpm
       - /tmp/ansible_deploy/libtsglua-1.0.8.0dbf2e6-2.el7.x86_64.rpm
       - /tmp/ansible_deploy/libwiredcfg-2.0.6.67ae0ab-2.el7.x86_64.rpm
       - /tmp/ansible_deploy/libWiredLB-2.0.5.4629165-2.el7.x86_64.rpm

roles/kni/tasks/main.yml

@@ -7,7 +7,7 @@
 - name: "install kni rpms from localhost"
   yum:
     name:
-      - /tmp/ansible_deploy/kni-21.03.01.916999f-2.el7.x86_64.rpm
+      - /tmp/ansible_deploy/kni-21.05.01.e7573e5-2.el7.x86_64.rpm
     state: present
 #    skip_broken: yes
 

roles/kni/templates/kni.conf.j2

@@ -49,7 +49,7 @@ keepalive_cnt = 3
 appsym = knifw
 
 [dup_traffic]
-switch = 1
+switch = 0
 action = 2
 capacity = 10000000
 error_rate = 0.00001

roles/sapp/tasks/main.yml

@@ -13,7 +13,7 @@
 - name: "install sapp rpms from localhost"
   yum:
     name:
-      - /tmp/ansible_deploy/sapp-4.2.32.91bc8e3-2.el7.x86_64.rpm
+      - /tmp/ansible_deploy/sapp-4.2.35.b0d7518-2.el7.x86_64.rpm
     state: present
  
 - name: "install tcpdump_mesa rpms from localhost"

roles/sapp/templates/conflist.inf.j2

@@ -1,16 +1,9 @@
 [platform]
-{% if tsg_access_type == 1 %}
+{% if tsg_access_type == 2 %}
-./plug/platform/g_device_plug/g_device_plug.inf
+./plug/platform/http_healthcheck/http_healthcheck.inf
-#./plug/platform/http_healthcheck/http_healthcheck.inf
-{% else %}
-#./plug/platform/g_device_plug/g_device_plug.inf
-#./plug/platform/http_healthcheck/http_healthcheck.inf
 {% endif %}
 ./plug/platform/app_proto_identify/app_proto_identify.inf
 ./plug/platform/tsg_master/tsg_master.inf
-{% if tsg_app.enable == 1 %}
-./plug/platform/app_master/app_master.inf
-{% endif %}
 
 [protocol]
 ./plug/protocol/mesa_sip/mesa_sip.inf
@@ -22,6 +15,7 @@
 ./plug/protocol/ftp/ftp.inf
 ./plug/protocol/quic/quic.inf
 ./plug/protocol/l2tp_protocol_plug/l2tp_protocol_plug.inf
+./plug/protocol/gtp/gtp.inf
 
 [business]
 ./plug/business/tsg_conn_sketch/tsg_conn_sketch.inf
@@ -38,6 +32,4 @@
 {% if tsg_app.enable == 1 %}
 ./plug/business/app_sketch_local/app_sketch_local.inf
 {% endif %}
-{% if tsg_access_type == 2 %}
+./plug/business/gtp_signaling_plug/gtp_signaling_plug.inf
-./plug/platform/http_healthcheck/http_healthcheck.inf
-{% endif %}

roles/sapp/templates/sapp.toml.j2

@@ -33,7 +33,7 @@ dictator_enable=0
     l2_l3_tunnel_support=1
 
 ### note, optional value is [none, vxlan]
-    {% if tsg_access_type == 5 %}
+    {% if tsg_access_type == 5 or tsg_access_type == 1 %}
     overlay_mode=vxlan
     {% else %}
     overlay_mode=none
@@ -123,7 +123,10 @@ dictator_enable=0
     reverse_ethernet_addr=1
 
 [DUPLICATE_PKT]
-    duplicate_pkt_distinguish=0
+    duplicate_pkt_distinguish=1
+    bloom_capacity=1000000
+    bloom_error_rate=0.00001
+    bloom_timeout=10
 	
 [STREAM]
 ### note, stream_id_base_time format is "%Y-%m-%d %H:%M:%S" 

roles/tfe/tasks/main.yml

@@ -13,8 +13,7 @@
 - name: "install tfe rpms from localhost"
   yum:
     name:
-      - /tmp/ansible_deploy/tfe-kmod-v1.0.5.20200408-1dkms.noarch.rpm
+      - /tmp/ansible_deploy/tfe-4.5.01.91facad-1.el7.x86_64.rpm
-      - /tmp/ansible_deploy/tfe-4.4.01.3e020b9-1.el7.x86_64.rpm
     state: present
 
 - name: "tfe:copy cert file to device"

roles/tfe/templates/tfe.conf.j2

@@ -1,7 +1,8 @@
 [system]
 nr_worker_threads={{ tfe.nr_threads }}
 enable_kni_v1=0
-enable_kni_v2=1
+enable_kni_v2=0
+enable_kni_v3=1
 
 # Only when (disable_coredump == 1 || (enable_breakpad == 1 && enable_breakpad_upload == 1)) is satisfied, the core will not be generated locally
 disable_coredump=0
@@ -19,6 +20,12 @@ cpu_affinity_mask=1-9
 # LEAST_CONN = 0; ROUND_ROBIN = 1
 load_balance=1
 
+[nfq]
+queue_id=1
+queue_maxlen=655350
+queue_rcvbufsiz=983025000
+queue_no_enobufs=1
+
 [kni]
 # kni v1
 #uxdomain=/var/run/.tfe_kni_acceptor_handler

roles/tfe/templates/tfe_kmod.conf.j2

@@ -1,2 +0,0 @@
-# load tfe_kmod at boot
-tfe_kmod

roles/tsg_app/tasks/main.yml

@@ -11,6 +11,6 @@
     skip_broken: yes
   vars:
     app_packages:
-      - /tmp/ansible_deploy/app_sketch_local-2.0.5.ff1622f-2.el7.x86_64.rpm
+      - /tmp/ansible_deploy/app_sketch_local-3.0.5.92c645f-2.el7.x86_64.rpm
   when: tsg_app.enable == 1
 

roles/tsg_master/tasks/main.yml

@@ -6,6 +6,6 @@
 - name: "install tsg_master from localhost"
   yum:
     name:
-      - /tmp/ansible_deploy/tsg_master-3.4.12.441b0d1-2.el7.x86_64.rpm
+      - /tmp/ansible_deploy/tsg_master-4.2.3.6c3f53d-2.el7.x86_64.rpm
     state: present
     skip_broken: yes