更新近期OAM升级包; 初始化内置设备标签, 不再通过界面人工编辑.

roles/tsg-cli-mcn1/files/tsg-monitor.sh

@@ -8,7 +8,7 @@
 killall_uncompleted_cmd(){
     #killall -9 tsg_cluster_register
     killall -9 -q tsg_diagnose_background
-    killall -9 -q tsg_update_tags
+    #killall -9 -q tsg_update_tags
     killall -9 -q tsg_monit_interface
     killall -9 -q tsg_monit_intercept
 	
@@ -19,7 +19,7 @@ start_background_cmd(){
     #后台并发运行, 保证所有命令的开始运行时间基本一样，
     #且不会因某个命令网络拥塞、执行时间长等问题，阻塞while(1)主循环
     /opt/tsg/tsg-monitor/tsg_diagnose_background > /dev/null &
-    /opt/tsg/tsg-monitor/tsg_update_tags > /dev/null &
+    #/opt/tsg/tsg-monitor/tsg_update_tags > /dev/null &
     /opt/tsg/tsg-monitor/tsg_monit_interface > /dev/null &
 	/opt/tsg/tsg-monitor/tsg_monit_intercept > /dev/null &
 }

roles/tsg-cli-mcn1/tasks/main.yml

@@ -1,7 +1,7 @@
 ---
 - name: "copy tsg-cli rmp to destination server"
   synchronize:
-    src: "{{ role_path }}/../tsg-common-files/{{ rpm_file_name }}"
+    src: "{{ role_path }}/../tsg-common-files/{{ tsg_cli.rpm_file_name }}"
     dest: "/tmp/tsg-cli-deploy/"
     
 - name: "install tsg-cli"
@@ -10,7 +10,7 @@
     state: present
   vars:
     packages:
-    - /tmp/tsg-cli-deploy/{{ rpm_file_name }}
+    - /tmp/tsg-cli-deploy/{{ tsg_cli.rpm_file_name }}
 
 - name: Template the tsg_sn.json
   template:
@@ -24,6 +24,18 @@
     src: "{{ role_path }}/../tsg-common-files/tsg_sn.json"
     dest: "/opt/tsg/etc/tsg_sn.json"
   when: use_chassis_hardware_sn | bool 
+
+- name: Template the tsg_tags.json
+  template:
+    src: "{{ role_path }}/../tsg-common-files/tsg_tags.json.j2"
+    dest: "/opt/tsg/etc/tsg_tags.json"
+  tags: template
+
+- name: Template the tsg_device_tag.json
+  template:
+    src: "{{ role_path }}/../tsg-common-files/tsg_device_tag.json.j2"
+    dest: "/opt/tsg/etc/tsg_device_tag.json"
+  tags: template
   
 - name: "copy tsg-monitor.service to destination server"
   synchronize: