From e522e090b587a76e07b35cc6959e33b2a35d9a18 Mon Sep 17 00:00:00 2001
From: zhangzhihan <zhangzhihan@zdjizhi.com>
Date: Wed, 23 Sep 2020 15:27:49 +0800
Subject: [PATCH] update

---
 install_config/group_vars/adc_global.yml          | 4 ++++
 install_config/group_vars/server_as_tun_mode.yml  | 4 ++++
 roles/tsg_app/templates/main.conf.j2              | 2 +-
 uninstall/roles/package_list/20.09.yml            | 5 +++--
 uninstall/roles/uninstall_adc_mcn0/tasks/main.yml | 1 +
 uninstall/roles/uninstall_server/tasks/main.yml   | 1 +
 uninstall/rpm_list.sh                             | 2 ++
 7 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/install_config/group_vars/adc_global.yml b/install_config/group_vars/adc_global.yml
index f49b963..fa55b95 100644
--- a/install_config/group_vars/adc_global.yml
+++ b/install_config/group_vars/adc_global.yml
@@ -90,3 +90,7 @@ mrtunnat:
 #Tsg_app
 tsg_app_enable: 1
 app_global_ip: "1.1.1.1"
+applog_level: 10
+app_master_log_level: 10
+app_sketch_local_log_level: 10
+app_control_plug_log_level: 10
diff --git a/install_config/group_vars/server_as_tun_mode.yml b/install_config/group_vars/server_as_tun_mode.yml
index c3b40cb..4c91543 100644
--- a/install_config/group_vars/server_as_tun_mode.yml
+++ b/install_config/group_vars/server_as_tun_mode.yml
@@ -104,6 +104,10 @@ mrtunnat:
 #Tsg_app
 tsg_app_enable: 1
 app_global_ip: "1.1.1.1"
+applog_level: 10
+app_master_log_level: 10
+app_sketch_local_log_level: 10
+app_control_plug_log_level: 10
 
 #########################################
 #ATCA Config
diff --git a/roles/tsg_app/templates/main.conf.j2 b/roles/tsg_app/templates/main.conf.j2
index df77ffe..bcde656 100644
--- a/roles/tsg_app/templates/main.conf.j2
+++ b/roles/tsg_app/templates/main.conf.j2
@@ -2,7 +2,7 @@
 QOS=1
 PUBLISH_TOPIC=APP_SIGNATURE_ID
 #CLIENT_ID=
-BROKER_LIST=tcp://192.168.40.161:1883
+BROKER_LIST=tcp://{{ app_global_ip }}:1883
 
 [LUA]
 ENABLE=1
diff --git a/uninstall/roles/package_list/20.09.yml b/uninstall/roles/package_list/20.09.yml
index 61da56a..40a8d4e 100644
--- a/uninstall/roles/package_list/20.09.yml
+++ b/uninstall/roles/package_list/20.09.yml
@@ -62,8 +62,9 @@ tsg_conn_sketch: tsg_conn_sketch-2.0.v2.0_alpha.af621ca-1.x86_64
 
 ####################
 #Tsg_app
-app_sketch_local: app_sketch_local-1.0.2.fd63c68-1.x86_64
-app_control_plug: app_control_plug-1.0.2.a724506-1.x86_64
+app_sketch_local: app_sketch_local-1.0.4.0edaf58-2.x86_64
+app_control_plug: app_control_plug-1.0.3.447fc53-2.x86_64
+app_proto_identify: app_proto_identify-1.0.3.6c893f2-2.x86_64 
 app_master: app_master-1.0.4.d189dee-1.x86_64
 
 ####################
diff --git a/uninstall/roles/uninstall_adc_mcn0/tasks/main.yml b/uninstall/roles/uninstall_adc_mcn0/tasks/main.yml
index 2bfd22b..a4c6498 100644
--- a/uninstall/roles/uninstall_adc_mcn0/tasks/main.yml
+++ b/uninstall/roles/uninstall_adc_mcn0/tasks/main.yml
@@ -148,6 +148,7 @@
     name:
       - "{{ app_sketch_local }}"
       - "{{ app_control_plug }}"
+      - "{{ app_proto_identify }}"
       - "{{ app_master }}"
     state: absent
   when:
diff --git a/uninstall/roles/uninstall_server/tasks/main.yml b/uninstall/roles/uninstall_server/tasks/main.yml
index 80cfb02..46dc14d 100644
--- a/uninstall/roles/uninstall_server/tasks/main.yml
+++ b/uninstall/roles/uninstall_server/tasks/main.yml
@@ -147,6 +147,7 @@
     name:
       - "{{ app_sketch_local }}"
       - "{{ app_control_plug }}"
+      - "{{ app_proto_identify }}"
       - "{{ app_master }}"
     state: absent
   when:
diff --git a/uninstall/rpm_list.sh b/uninstall/rpm_list.sh
index 30492a5..8b6b11b 100755
--- a/uninstall/rpm_list.sh
+++ b/uninstall/rpm_list.sh
@@ -35,6 +35,7 @@ tsg_conn_sketch=`rpm -qa |grep ^tsg_conn_sketch`
 tsg_conn_record=`rpm -qa |grep ^tsg_conn_record`
 app_sketch_local=`rpm -qa |grep ^app_sketch_local`
 app_control_plug=`rpm -qa |grep ^app_control_plug`
+app_proto_identify=`rpm -qa |grep ^app_proto_identify`
 app_master=`rpm -qa |grep ^app_master`
 tfe=`rpm -qa |grep ^tfe-4`
 tfe_kmod=`rpm -qa |grep ^tfe-kmod`
@@ -108,6 +109,7 @@ tsg_conn_record: $tsg_conn_record
 #Tsg_app
 app_sketch_local: $app_sketch_local
 app_control_plug: $app_control_plug
+app_proto_identify: $app_proto_identify
 app_master: $app_master
 
 ####################