diff --git a/ansible/install_config/group_vars/rpm_version.yml b/ansible/install_config/group_vars/rpm_version.yml index a3ff2e16..3586bf6b 100644 --- a/ansible/install_config/group_vars/rpm_version.yml +++ b/ansible/install_config/group_vars/rpm_version.yml @@ -4,8 +4,7 @@ certstore_rpm_version: firewall_rpm_version: capture_packet_plug: capture_packet_plug-4.1.5.b9783ff conn_telemetry: conn_telemetry-1.0.3.4ef6df6 - fw_dns_plug: fw_dns_plug-4.0.4.7ce1b29 - firewall: firewall-1.0.4.a6177f6 + firewall: firewall-1.0.5.e0dad18 tsg_conn_sketch: tsg_conn_sketch-3.3.19.ac8d850 gtp_signaling_plug: gtp_signaling_plug-1.0.5.8d64946 tsg_vulpes: tsg_vulpes-1.0.9.0d7c615 @@ -14,10 +13,10 @@ firewall_rpm_version: app_proto_engine: app_proto_engine-2.3.8.24e1d7b tsg_ddos_sketch: tsg_ddos_sketch-1.3.5.447bcc2 dns: dns-2.1.4.fa0ebd4 - ftp: ftp-1.0.14.02d6a2c + ftp: ftp-1.0.15.1fc64fe http: http-2.0.11.cb4adbb mail: mail-1.0.17.eb41cef - quic: quic-2.0.4.ffb443e + quic: quic-2.0.5.96f9ce3 ssl: ssl-2.0.12.d55819b rtp: rtp-1.0.7.530ac76 gtp: gtp-1.0.7.e1041b2 @@ -74,7 +73,7 @@ tsg_app_rpm_version: app_sketch_local: app_sketch_local-4.5.5.7a60af1 tsg_master_rpm_version: - tsg_master: tsg_master-5.10.3.ce5ab5a + tsg_master: tsg_master-5.10.4.9feef23 shaping_master_rpm_version: shaping_master: shaping_master-1.0.3.6bebaf4 @@ -90,8 +89,8 @@ wannat_wangw_rpm_version: libwannat_common: libwannat_common-1.0.3.6dc42b6 wire_graft_rpm_version: - wire_graft: wire_graft_plug-1.5.7.6cdcefb - libwire_graft: libwire_graft-1.5.7.6cdcefb + wire_graft: wire_graft_plug-1.5.8.211f1f1 + libwire_graft: libwire_graft-1.5.8.211f1f1 hasp_update_rpm_version: hasp_update: hasp_update-1.0.1.b836a3b diff --git a/ansible/roles/sapp/templates/conflist.inf.j2.j2 b/ansible/roles/sapp/templates/conflist.inf.j2.j2 index 8bf7977c..394e42e7 100644 --- a/ansible/roles/sapp/templates/conflist.inf.j2.j2 +++ b/ansible/roles/sapp/templates/conflist.inf.j2.j2 @@ -64,7 +64,6 @@ ./plug/business/kni/kni.inf {% endif %} {% if firewall.enable == 1 %} -./plug/business/fw_dns_plug/fw_dns_plug.inf ./plug/business/firewall/firewall.inf ./plug/business/gtp_signaling_plug/gtp_signaling_plug.inf {% endif %} diff --git a/ansible/roles/traffic-engine/files/helm/conf/conflist.inf b/ansible/roles/traffic-engine/files/helm/conf/conflist.inf index ad38f2be..4b3528d7 100644 --- a/ansible/roles/traffic-engine/files/helm/conf/conflist.inf +++ b/ansible/roles/traffic-engine/files/helm/conf/conflist.inf @@ -83,9 +83,6 @@ ./plug/business/kni/kni.inf {{- end }} {{- if eq .Values.firewall.enable .Values.define_enable_val_yes }} -{{- if eq .Values.decoders.DNS .Values.define_enable_val_yes }} -./plug/business/fw_dns_plug/fw_dns_plug.inf -{{- end }} ./plug/business/firewall/firewall.inf {{- end }} {{- if eq .Values.decoders.GTPC .Values.define_enable_val_yes }}