21.04 版本更新，更新记录：https://docs.geedge.net/pages/viewpage.action?pageId=28803144

roles/certstore/tasks/main.yml

@@ -10,7 +10,7 @@
 - name: install certstore
   yum:
     name:
-      - /tmp/ansible_deploy/certstore-2.1.6.20201215.f2e9ba7-1.el7.x86_64.rpm
+      - /tmp/ansible_deploy/certstore-2.1.7.20210422.3f0c7ed-1.el7.x86_64.rpm
     state: present
 
 - name: template certstore configure file

roles/firewall/tasks/main.yml

@@ -15,21 +15,21 @@
       - /tmp/ansible_deploy/conn_telemetry-1.0.2.8d6da43-2.el7.x86_64.rpm
       - /tmp/ansible_deploy/dns-2.0.11.2265b5c-2.el7.x86_64.rpm
       - /tmp/ansible_deploy/ftp-1.0.8.13d5fda-2.el7.x86_64.rpm
-      - /tmp/ansible_deploy/fw_dns_plug-3.0.2.dab58fa-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.5.69f6482-2.el7.x86_64.rpm
+      - /tmp/ansible_deploy/fw_http_plug-3.1.11.b0f7b8f-2.el7.x86_64.rpm
-      - /tmp/ansible_deploy/fw_mail_plug-3.0.2.7401550-2.el7.x86_64.rpm
+      - /tmp/ansible_deploy/fw_mail_plug-3.0.9.d496513-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/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/tsg_conn_sketch-2.1.4.f333054-2.el7.x86_64.rpm
+      - /tmp/ansible_deploy/tsg_conn_sketch-2.1.16.7b1b2d5-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.9.ede6893-2.el7.x86_64.rpm
+      - /tmp/ansible_deploy/mesa_sip-1.0.15.77d2f1a-2.el7.x86_64.rpm
-      - /tmp/ansible_deploy/fw_voip_plug-1.0.2.090e5da-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.9.a6581a6-2.el7.x86_64.rpm
+      - /tmp/ansible_deploy/app_proto_identify-1.0.10.1eeff1d-2.el7.x86_64.rpm
 
 - name: "Template the tsgconf/main.conf"
   template:

roles/framework/tasks/main.yml

@@ -12,7 +12,7 @@
     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.14.673eeb9-2.el7.x86_64.rpm
+      - /tmp/ansible_deploy/libmaatframe-3.1.19.66c294f-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

roles/sapp/tasks/main.yml

@@ -13,13 +13,13 @@
 - name: "install sapp rpms from localhost"
   yum:
     name:
-      - /tmp/ansible_deploy/sapp-4.2.26.fc1a6aa-2.el7.x86_64.rpm
+      - /tmp/ansible_deploy/sapp-4.2.32.91bc8e3-2.el7.x86_64.rpm
     state: present
  
 - name: "install tcpdump_mesa rpms from localhost"
   yum:
     name:
-      - /tmp/ansible_deploy/tcpdump_mesa-1.0.2.0c5a950-2.el7.x86_64.rpm
+      - /tmp/ansible_deploy/tcpdump_mesa-1.0.4.4ef2936-2.el7.x86_64.rpm
     state: present
     skip_broken: yes
 

roles/sapp/templates/sapp.service.j2

@@ -17,6 +17,7 @@ LimitCORE=0
 TasksMax=infinity
 Delegate=yes
 KillMode=process
+WatchdogSec=10s
 
 [Install]
 WantedBy=multi-user.target

roles/sapp/templates/sapp.toml.j2

@@ -207,7 +207,7 @@ dictator_enable=0
         dump_thread_id=[0,1,2,3,4]
    
         [tools.pkt_dump.udp]
-        command_port=9345
+        command_port=12345
 
         [tools.pkt_dump.storage]
 ### note, file path must be double quotation mark extension, for example,  path="/dev/shm/pkt_dump"

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.30.62dde9e-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/pangu_pxy.conf.j2

@@ -6,40 +6,26 @@ enable_plugin=1
 en_sendlog=1
 entrance_id=0
 
-#Addresses of minio. Format is defined by WiredLB.
+#Addresses of hos, Bucket name in hos. Format is defined by WiredLB.
-#minio_ip_list=192.168.10.61-64;
+cache_ip_list= {{ log_minio.address }}
-minio_ip_list= {{ log_minio.address }}
+cache_listen_port= {{ log_minio.port }}
-minio_listen_port= {{ log_minio.port }}
+cache_bucket_name=hos/proxy_hos_bucket
-#Maximum number of connections opened by per host.
+cache_token=c21f969b5f03d33d43e04f8f136e7682
-#MAX_CONNECTION_PER_HOST=1
-#Maximum number of requests in a pipeline.
-#MAX_CNNT_PIPELINE_NUM=20
-#Maximum parellel sessions(http and redis) is allowed to open.
-#MAX_CURL_SESSION_NUM=100
-#Maximum time the request is allowed to take(seconds).
-#MAX_CURL_TRANSFER_TIMEOUT_S=0
 
-#Bucket name in minio.
+#Refer to the pangu_cahche definition
-cache_bucket_name=proxybucket
-#Maximum size of memory used by tango_cache_client. Upload will fail if the current size of memory used exceeds this value.
 max_used_memroy_size_mb=5120
-#Default TTL of objects, i.e. the time after which the object will expire(minumun 60s, i.e. 1 minute).
 cache_default_ttl_second=3600
-#Whether to hash the object key before cache actions. GET/PUT may be faster if you open it.
 cache_object_key_hash_switch=1
 
-#Store way: 0-MINIO; 1-META in REDIS, object in minio; 2-META and small object in Redis, large object in minio;
 cache_store_object_way=0
-#If CACHE_STORE_OBJECT_WAY is 2 and the size of a object is not bigger than this value, object will be stored in redis.
 redis_cache_object_size=1024000
-#Configs of WiredLB for Minios load balancer.
+
-#WIREDLB_OVERRIDE=1
-#wiredlb_health_port=42310
 #If CACHE_STORE_OBJECT_WAY is not 0, we will use redis to store meta and object.
 redis_cluster_ip_list=192.168.10.62-63;
 redis_cluster_port_range=6379
 #wired load balancer configuration
 
+#Configs of WiredLB for Minios load balancer.
 wiredlb_override=1
 wiredlb_topic=MinioFileLog
 wiredlb_datacenter=k18consul-tse
@@ -54,6 +40,7 @@ log_fsstat_dst_ip=10.4.20.202
 log_fsstat_dst_port=8125
 
 [ratelimit]
+#hijack flow control
 enable=0
 token_name=ratelimit
 redis_server={{ maat_redis_server.address }}
@@ -62,32 +49,27 @@ redis_db_index=6
 
 [tango_cache]
 enable_cache=0
-minio_ip_list=192.168.10.61-64;
+cache_ip_list=192.168.10.61-64;
-minio_listen_port=9000
+cache_listen_port=9000
+cache_bucket_name=hos/proxy_hos_bucket
+cache_token=c21f969b5f03d33d43e04f8f136e7682
 
-#max_connection_per_host=1
 max_cnnt_pipeline_num=20
-#max_curl_session_num=100
+#Maximum size of memory used by tango_cache_client. Upload will fail if the current size of memory used exceeds this value.
-
-cache_bucket_name=proxybucket
 max_used_memory_size_mb=10240
+#Default TTL of objects, i.e. the time after which the object will expire(minumun 60s, i.e. 1 minute).
 cache_default_ttl_second=3600
+#Whether to hash the object key before cache actions. GET/PUT may be faster if you open it.
 cache_object_key_hash_switch=1
-
+#Store way: 0-HOS; 1-META in REDIS, object in hos; 2-META and small object in Redis, large object in hos;
-#1-minio，2-redis
+cache_store_object_way=2
-#Store way: 0-MINIO; 1-META in REDIS, object in minio; 2-META and small object in Redis, large object in minio;
-cache_store_object_way=0
 #If CACHE_STORE_OBJECT_WAY is 2 and the size of a object is not bigger than this value, object will be stored in redis.
 redis_cache_object_size=102400
 #If CACHE_STORE_OBJECT_WAY is not 0, we will use redis to store meta and object.
 redis_cluster_ip_list=192.168.10.62-63;
 redis_cluster_port_range=6379
-#wired load balancer configuration
+
-wiredlb_override=1
+#Configs of WiredLB for Minios load balancer.Refer to the definition at log
-wiredlb_topic=MinioCache
-wiredlb_datacenter=k18consul-tse
-wiredlb_health_port=52101
-wiredlb_group=TangoCache
 
 cache_undefined_obj=1
 query_undefined_obj=0

roles/tsg_app/tasks/main.yml

@@ -11,6 +11,6 @@
     skip_broken: yes
   vars:
     app_packages:
-      - /tmp/ansible_deploy/app_sketch_local-2.0.2.edf4fb0-2.el7.x86_64.rpm
+      - /tmp/ansible_deploy/app_sketch_local-2.0.5.ff1622f-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.6.3851946-2.el7.x86_64.rpm
+      - /tmp/ansible_deploy/tsg_master-3.4.12.441b0d1-2.el7.x86_64.rpm
     state: present
     skip_broken: yes