diff --git a/roles/packet_dump/files/packet_dump-1.0.2.90c24cb-2.el7.x86_64.rpm b/roles/packet_dump/files/packet_dump-1.0.2.90c24cb-2.el7.x86_64.rpm deleted file mode 100644 index e29602f..0000000 Binary files a/roles/packet_dump/files/packet_dump-1.0.2.90c24cb-2.el7.x86_64.rpm and /dev/null differ diff --git a/roles/packet_dump/files/packet_dump-1.0.3.a3f1a99-2.el7.x86_64.rpm b/roles/packet_dump/files/packet_dump-1.0.3.a3f1a99-2.el7.x86_64.rpm new file mode 100644 index 0000000..2e22e83 Binary files /dev/null and b/roles/packet_dump/files/packet_dump-1.0.3.a3f1a99-2.el7.x86_64.rpm differ diff --git a/roles/packet_dump/tasks/main.yml b/roles/packet_dump/tasks/main.yml index 89b5289..504a61f 100644 --- a/roles/packet_dump/tasks/main.yml +++ b/roles/packet_dump/tasks/main.yml @@ -1,6 +1,6 @@ - name: "copy packet_dump rpm to destination server" copy: - src: "{{ role_path }}/files/packet_dump-1.0.2.90c24cb-2.el7.x86_64.rpm" + src: "{{ role_path }}/files/packet_dump-1.0.3.a3f1a99-2.el7.x86_64.rpm" dest: /tmp/ansible_deploy/ - name: "copy packet_dump.service to destination server" @@ -12,7 +12,7 @@ - name: "install packet_dump rpm from localhost" yum: name: - - /tmp/ansible_deploy/packet_dump-1.0.2.90c24cb-2.el7.x86_64.rpm + - /tmp/ansible_deploy/packet_dump-1.0.3.a3f1a99-2.el7.x86_64.rpm state: present - name: "Template the packet_dump.conf" @@ -26,4 +26,3 @@ name: packet_dump.service enabled: yes daemon_reload: yes - diff --git a/roles/sapp/templates/conflist.inf.j2 b/roles/sapp/templates/conflist.inf.j2 index 2c674a4..b22d662 100644 --- a/roles/sapp/templates/conflist.inf.j2 +++ b/roles/sapp/templates/conflist.inf.j2 @@ -11,6 +11,7 @@ {% endif %} ./plug/platform/tsg_master/tsg_master.inf {% if tsg_app_enable == 1 %} +./plug/business/app_proto_identify/app_proto_identify.inf ./plug/platform/app_master/app_master.inf {% endif %} @@ -35,5 +36,4 @@ {% if tsg_app_enable == 1 %} ./plug/business/app_sketch_local/app_sketch_local.inf ./plug/business/app_control_plug/app_control_plug.inf -./plug/business/app_proto_identify/app_proto_identify.inf {% endif %} diff --git a/roles/tsg_app/files/app_proto_identify-1.0.3.6c893f2-2.el7.x86_64.rpm b/roles/tsg_app/files/app_proto_identify-1.0.3.6c893f2-2.el7.x86_64.rpm deleted file mode 100644 index 11284ff..0000000 Binary files a/roles/tsg_app/files/app_proto_identify-1.0.3.6c893f2-2.el7.x86_64.rpm and /dev/null differ diff --git a/roles/tsg_app/files/app_proto_identify-1.0.4.fd3ac1a-2.el7.x86_64.rpm b/roles/tsg_app/files/app_proto_identify-1.0.4.fd3ac1a-2.el7.x86_64.rpm new file mode 100644 index 0000000..52aa21b Binary files /dev/null and b/roles/tsg_app/files/app_proto_identify-1.0.4.fd3ac1a-2.el7.x86_64.rpm differ diff --git a/roles/tsg_app/tasks/main.yml b/roles/tsg_app/tasks/main.yml index 72ae845..0ab4d80 100644 --- a/roles/tsg_app/tasks/main.yml +++ b/roles/tsg_app/tasks/main.yml @@ -13,7 +13,7 @@ app_packages: - /tmp/ansible_deploy/app_master-1.0.5.5a4fb22-2.el7.x86_64.rpm - /tmp/ansible_deploy/app_control_plug-1.0.3.447fc53-2.el7.x86_64.rpm - - /tmp/ansible_deploy/app_proto_identify-1.0.3.6c893f2-2.el7.x86_64.rpm + - /tmp/ansible_deploy/app_proto_identify-1.0.4.fd3ac1a-2.el7.x86_64.rpm - /tmp/ansible_deploy/app_sketch_local-1.0.4.0edaf58-2.el7.x86_64.rpm when: tsg_app_enable == 1 diff --git a/roles/tsg_master/files/tsg_master-3.3.2.899ae69-2.el7.x86_64.rpm b/roles/tsg_master/files/tsg_master-3.3.3.46322d0-2.el7.x86_64.rpm similarity index 50% rename from roles/tsg_master/files/tsg_master-3.3.2.899ae69-2.el7.x86_64.rpm rename to roles/tsg_master/files/tsg_master-3.3.3.46322d0-2.el7.x86_64.rpm index 5f77ed6..8cf4aed 100644 Binary files a/roles/tsg_master/files/tsg_master-3.3.2.899ae69-2.el7.x86_64.rpm and b/roles/tsg_master/files/tsg_master-3.3.3.46322d0-2.el7.x86_64.rpm differ diff --git a/roles/tsg_master/tasks/main.yml b/roles/tsg_master/tasks/main.yml index 554f00e..ea244bc 100644 --- a/roles/tsg_master/tasks/main.yml +++ b/roles/tsg_master/tasks/main.yml @@ -6,6 +6,6 @@ - name: "install tsg_master from localhost" yum: name: - - /tmp/ansible_deploy/tsg_master-3.3.2.899ae69-2.el7.x86_64.rpm + - /tmp/ansible_deploy/tsg_master-3.3.3.46322d0-2.el7.x86_64.rpm state: present skip_broken: yes