diff --git a/ansible/install_config/group_vars/rpm_version.yml b/ansible/install_config/group_vars/rpm_version.yml index ea29a8cd..67b476a8 100644 --- a/ansible/install_config/group_vars/rpm_version.yml +++ b/ansible/install_config/group_vars/rpm_version.yml @@ -8,7 +8,7 @@ firewall_rpm_version: ftp: ftp-1.0.8.13d5fda fw_dns_plug: fw_dns_plug-3.0.6.57c2feb fw_ftp_plug: fw_ftp_plug-3.0.1.0a78573 - fw_http_plug: fw_http_plug-3.2.4.8add122 + fw_http_plug: fw_http_plug-3.2.5.30df450 fw_mail_plug: fw_mail_plug-3.1.1.777fa90 fw_quic_plug: fw_quic_plug-3.0.4.947ef77 fw_ssl_plug: fw_ssl_plug-3.1.0.10d88fa @@ -60,7 +60,7 @@ tfe_rpm_version: tfe: tfe-4.5.3.d18b647 tsg_app_rpm_version: - app_sketch_local: app_sketch_local-3.0.6.6977511 + app_sketch_local: app_sketch_local-3.0.8.ea0c3d7 tsg_master_rpm_version: tsg_master: tsg_master-4.2.5.8d03091 diff --git a/ansible/roles/firewall/templates/main.conf.j2.j2 b/ansible/roles/firewall/templates/main.conf.j2.j2 index 8f28d001..57500bca 100644 --- a/ansible/roles/firewall/templates/main.conf.j2.j2 +++ b/ansible/roles/firewall/templates/main.conf.j2.j2 @@ -103,7 +103,8 @@ QOS=1 PUBLISH_TOPIC="APP_SIGNATURE_ID" #CLIENT_ID= {% raw %} -BROKER_LIST="{{ firewall.APP_SKETCH_BROKER_LIST }}" +BROKER_IP="{{ firewall.APP_SKETCH_BROKER_IP }}" +BROKER_PORT="{{ firewall.APP_SKETCH_BROKER_PORT }}" {% endraw %} [APP_PROTO_ENGINE] diff --git a/ansible/roles/tsg-os-provision/files/tsg-os-provision/provision.yml.sample b/ansible/roles/tsg-os-provision/files/tsg-os-provision/provision.yml.sample index 30ce38b0..ead85fac 100644 --- a/ansible/roles/tsg-os-provision/files/tsg-os-provision/provision.yml.sample +++ b/ansible/roles/tsg-os-provision/files/tsg-os-provision/provision.yml.sample @@ -25,7 +25,8 @@ firewall: hos_serverip: "192.168.40.223" hos_serverport: 9098 APP_SKETCH_PUBLISH_TOPIC: "APP_SIGNATURE_ID" - APP_SKETCH_BROKER_LIST: "tcp://192.168.40.161:1883" + APP_SKETCH_BROKER_IP: "192.168.40.161" + APP_SKETCH_BROKER_PORT: 1883 pangu_pxy: