diff --git a/adc166_170.deploy.yml b/adc166_170.deploy.yml deleted file mode 100644 index c171468..0000000 --- a/adc166_170.deploy.yml +++ /dev/null @@ -1,41 +0,0 @@ -- hosts: blade-mxn - roles: - - consul-external - - tsg-cli-mxn - - oam_cli_agent_mxn - - oam_cli - - oam_core - - oam_snmp - -- hosts: blade-mcn0 - roles: - #- consul-internal_mcn01 - - telegraf - - influxdb - - grafana - - tsg-cli-mcn0 - #- mariadb - - oam_cli_agent - -- hosts: blade-mcn1 - roles: - #- consul-internal_mcn01 - - tsg-cli-mcn1 - - oam_cli_agent - -- hosts: blade-mcn2 - roles: - #- consul-internal_mcn23 - - tsg-cli-mcn2 - - oam_cli_agent - -- hosts: blade-mcn3 - roles: - #- consul-internal_mcn23 - - tsg-cli-mcn3 - - oam_cli_agent - -- hosts: blade-mxn - roles: - - oam_mxn_start - diff --git a/install_config/adc166_170.host b/install_config/adc166_170.host deleted file mode 100644 index 6c1d872..0000000 --- a/install_config/adc166_170.host +++ /dev/null @@ -1,24 +0,0 @@ -[all:vars] -ansible_user=root -use_chassis_hardware_sn=true - -[cluster_server] -192.168.44.56 influxdb_cluster=true - -[cluster_server_backup] -192.168.44.57 influxdb_cluster=true - -[blade-mxn] -192.168.40.170 tag_location=Almaty - -[blade-mcn0] -192.168.40.166 tag_location=Almaty - -[blade-mcn1] -192.168.40.167 tag_location=Almaty - -[blade-mcn2] -192.168.40.168 tag_location=Almaty - -[blade-mcn3] -192.168.40.169 tag_location=Almaty diff --git a/install_config/group_vars/all.yml b/install_config/group_vars/all.yml index 95642ee..a4c71fe 100644 --- a/install_config/group_vars/all.yml +++ b/install_config/group_vars/all.yml @@ -12,7 +12,7 @@ influxdb: wal_dir: /var/lib/influxdb/wal-dir consul: - datacenter: consul-yz + datacenter: consul-kz dckey: "XwXLAbVN1C44dLUVJ6UL5A==" cluster_ip: "192.168.44.56" cluster_ip_backup: "192.168.44.57" @@ -32,7 +32,7 @@ oam: mcn0_ip: "192.168.100.1" tsg_cli: - rpm_file_name: "tsg-cli-1.0.18.c5fdb96-1.el7.x86_64.rpm" + rpm_file_name: "tsg-cli-1.0.19.ecf9c86-1.el7.x86_64.rpm" ha_master: instance_state: MASTER @@ -47,3 +47,5 @@ ha_backup: java_version: jdk1.8.0_73 bifang_api_ip: "192.168.43.5" bifang_api_port: 8080 + +tag_location: "xinxigang" \ No newline at end of file diff --git a/install_config/hosts b/install_config/hosts index 9030dac..afe1893 100644 --- a/install_config/hosts +++ b/install_config/hosts @@ -9,16 +9,16 @@ use_chassis_hardware_sn=false 192.168.44.57 influxdb_cluster=true [blade-mxn] -192.168.40.25 SN=CBT2201925000002 tag_location=xinxigang +192.168.40.25 [blade-mcn0] -192.168.40.21 SN=CBT2201925000002 tag_location=xinxigang +192.168.40.21 [blade-mcn1] -192.168.40.22 SN=CBT2201925000002 tag_location=xinxigang +192.168.40.22 [blade-mcn2] -192.168.40.23 SN=CBT2201925000002 tag_location=xinxigang +192.168.40.23 [blade-mcn3] -192.168.40.24 SN=CBT2201925000002 tag_location=xinxigang +192.168.40.24 diff --git a/roles/oam_cli/files/oam_cli.service b/roles/oam_cli/files/oam_cli.service index a9d6331..2664a1e 100644 --- a/roles/oam_cli/files/oam_cli.service +++ b/roles/oam_cli/files/oam_cli.service @@ -3,7 +3,6 @@ Description=oam_cli restart [Service] Type=oneshot - ExecStart=/usr/bin/mount --bind /opt/tsg/etc /home/tsgroot/opt/tsg/etc ExecStart=/usr/bin/mount -o bind /proc /home/tsgroot/proc ExecStart=/usr/bin/mount -o remount,rw,bind /proc /home/tsgroot/proc diff --git a/roles/tsg-cli-mcn0/files/tsg-monitor.sh b/roles/tsg-cli-mcn0/files/tsg-monitor.sh index 6176dcc..7a8cd2e 100644 --- a/roles/tsg-cli-mcn0/files/tsg-monitor.sh +++ b/roles/tsg-cli-mcn0/files/tsg-monitor.sh @@ -17,8 +17,13 @@ killall_uncompleted_cmd(){ killall -9 -q tsg_monit_protocol_v4 #killall -9 -q tsg_monit_stream_v3 killall -9 -q tsg_monit_stream_v4 - - rm -rf /tmp/_MEI* + + cmd_run=`ps -ef | grep tsg_ | grep -v grep` + if [ ${#cmd_run} -lt 1 ] ; then + #在没有其他tsg_xxx命令正在执行时, 删除执行命令错误被强制kill时, python生成的临时文件 + rm -rf /tmp/_MEI* + fi + } start_background_cmd(){ diff --git a/roles/tsg-cli-mcn1/files/tsg-monitor.sh b/roles/tsg-cli-mcn1/files/tsg-monitor.sh index f7b0fb1..300ebc3 100644 --- a/roles/tsg-cli-mcn1/files/tsg-monitor.sh +++ b/roles/tsg-cli-mcn1/files/tsg-monitor.sh @@ -12,7 +12,11 @@ killall_uncompleted_cmd(){ killall -9 -q tsg_monit_interface killall -9 -q tsg_monit_intercept - rm -rf /tmp/_MEI* + cmd_run=`ps -ef | grep tsg_ | grep -v grep` + if [ ${#cmd_run} -lt 1 ] ; then + #在没有其他tsg_xxx命令正在执行时, 删除执行命令错误被强制kill时, python生成的临时文件 + rm -rf /tmp/_MEI* + fi } start_background_cmd(){ diff --git a/roles/tsg-cli-mcn2/files/tsg-monitor.sh b/roles/tsg-cli-mcn2/files/tsg-monitor.sh index a550147..b039721 100644 --- a/roles/tsg-cli-mcn2/files/tsg-monitor.sh +++ b/roles/tsg-cli-mcn2/files/tsg-monitor.sh @@ -12,7 +12,11 @@ killall_uncompleted_cmd(){ killall -9 -q tsg_monit_interface killall -9 -q tsg_monit_intercept - rm -rf /tmp/_MEI* + cmd_run=`ps -ef | grep tsg_ | grep -v grep` + if [ ${#cmd_run} -lt 1 ] ; then + #在没有其他tsg_xxx命令正在执行时, 删除执行命令错误被强制kill时, python生成的临时文件 + rm -rf /tmp/_MEI* + fi } start_background_cmd(){ diff --git a/roles/tsg-cli-mcn3/files/tsg-monitor.sh b/roles/tsg-cli-mcn3/files/tsg-monitor.sh index a984a28..2eaa0e2 100644 --- a/roles/tsg-cli-mcn3/files/tsg-monitor.sh +++ b/roles/tsg-cli-mcn3/files/tsg-monitor.sh @@ -12,7 +12,11 @@ killall_uncompleted_cmd(){ killall -9 -q tsg_monit_interface killall -9 -q tsg_monit_intercept - rm -rf /tmp/_MEI* + cmd_run=`ps -ef | grep tsg_ | grep -v grep` + if [ ${#cmd_run} -lt 1 ] ; then + #在没有其他tsg_xxx命令正在执行时, 删除执行命令错误被强制kill时, python生成的临时文件 + rm -rf /tmp/_MEI* + fi } start_background_cmd(){ diff --git a/roles/tsg-cli-mxn/files/tsg-monitor.sh b/roles/tsg-cli-mxn/files/tsg-monitor.sh index 7aa8874..3205950 100644 --- a/roles/tsg-cli-mxn/files/tsg-monitor.sh +++ b/roles/tsg-cli-mxn/files/tsg-monitor.sh @@ -2,6 +2,8 @@ #mxn +#ps -afx |grep xxx, 结果是空返回值是1; 结果不为空返回值是0; + #防止因上一次的命令阻塞或长时间未返回, #导致10秒内还不结束, 要强行杀掉, #否则长时间运行后, 会有大量后台进程运行! @@ -10,8 +12,12 @@ killall_uncompleted_cmd(){ #killall -9 -q tsg_diagnose_background #killall -9 -q tsg_update_tags - rm -rf /tmp/_MEI* -} + cmd_run=`ps -ef | grep tsg_ | grep -v grep` + if [ ${#cmd_run} -lt 1 ] ; then + #在没有其他tsg_xxx命令正在执行时, 删除执行命令错误被强制kill时, python生成的临时文件 + rm -rf /tmp/_MEI* + fi +} start_background_cmd(){ #后台并发运行, 保证所有命令的开始运行时间基本一样， diff --git a/roles/tsg-common-files/tsg-cli-1.0.18.c5fdb96-1.el7.x86_64.rpm b/roles/tsg-common-files/tsg-cli-1.0.19.ecf9c86-1.el7.x86_64.rpm similarity index 91% rename from roles/tsg-common-files/tsg-cli-1.0.18.c5fdb96-1.el7.x86_64.rpm rename to roles/tsg-common-files/tsg-cli-1.0.19.ecf9c86-1.el7.x86_64.rpm index f228a29..57c177d 100644 Binary files a/roles/tsg-common-files/tsg-cli-1.0.18.c5fdb96-1.el7.x86_64.rpm and b/roles/tsg-common-files/tsg-cli-1.0.19.ecf9c86-1.el7.x86_64.rpm differ diff --git a/roles/tsg-common-files/tsg_sn.json b/roles/tsg-common-files/tsg_sn.json index 7fc8fa0..21afb97 100644 --- a/roles/tsg-common-files/tsg_sn.json +++ b/roles/tsg-common-files/tsg_sn.json @@ -1 +1 @@ -{"sn": "GN201020CH1234567890"} +{"sn": "GN201021CH1921684055"} diff --git a/uninstall.yml b/uninstall.yml deleted file mode 100644 index 43b99ea..0000000 --- a/uninstall.yml +++ /dev/null @@ -1,69 +0,0 @@ ---- -- hosts: blade-mxn - tasks: - - name: "stop oam_core.service" - service: - name: oam_core - state: stopped - ignore_errors: yes - - - name: "stop oam_snmp service" - service: - name: oam_snmp - state: stopped - ignore_errors: yes - - - name: "stop oam_cli service" - service: - name: oam_cli - state: stopped - ignore_errors: yes - - - name: "stop oam_cli_agent_mxn service" - service: - name: oam_cli_agent_mxn - state: stopped - ignore_errors: yes - - - name: "stop consul-server-external service" - service: - name: consul-server-external - state: stopped - ignore_errors: yes - - - - name: "uninstall oam_core" - yum: - name: "oam_core" - state: absent - - - name: "uninstall oam_cli" - yum: - name: "oam_cli" - state: absent - - - name: "uninstall oam_cli_agent_mxn" - yum: - name: "oam_cli_agent_mxn" - state: absent - - - - name: "uninstall tsg-cli" - yum: - name: "tsg-cli" - state: absent - - -- hosts: all - tasks: - - name: "stop tsg-monitor service" - service: - name: tsg-monitor - state: stopped - ignore_errors: yes - - - name: "uninstall tsg-cli" - yum: - name: "tsg-cli" - state: absent -