From d21157a82404aa8712b951825851376f613a3f87 Mon Sep 17 00:00:00 2001 From: fumingwei Date: Tue, 3 Nov 2020 11:58:05 +0600 Subject: [PATCH] 1.modify almaty and NurSultan redis config 2.add unistall role: --- Almaty_deploy.yml | 1 + Almaty_install_config/group_vars/adc_global.yml | 4 ++-- NurSultan_deploy.yml | 3 +-- NurSultan_install_config/group_vars/adc_global.yml | 4 ++-- roles/tsg-diagnose-uninstall/tasks/main.yml | 9 +++++++++ uninstall_process.yml | 4 ++++ 6 files changed, 19 insertions(+), 6 deletions(-) create mode 100644 roles/tsg-diagnose-uninstall/tasks/main.yml create mode 100644 uninstall_process.yml diff --git a/Almaty_deploy.yml b/Almaty_deploy.yml index d638dd9..f8c721d 100644 --- a/Almaty_deploy.yml +++ b/Almaty_deploy.yml @@ -40,6 +40,7 @@ - http_healthcheck - redis - cert-redis + - maat-redis - certstore - telegraf_statistic # - tsg_device_tag diff --git a/Almaty_install_config/group_vars/adc_global.yml b/Almaty_install_config/group_vars/adc_global.yml index f2c4146..df646bf 100644 --- a/Almaty_install_config/group_vars/adc_global.yml +++ b/Almaty_install_config/group_vars/adc_global.yml @@ -15,13 +15,13 @@ maat_redis_city_server: port: 7002 maat_redis_server: - address: "192.168.100.4" + address: "192.168.100.1" port: 7002 port_num: 1 db: 0 dynamic_maat_redis_server: - address: "192.168.100.4" + address: "192.168.100.1" port: 7002 port_num: 1 db: 1 diff --git a/NurSultan_deploy.yml b/NurSultan_deploy.yml index 03fef4e..05b37de 100644 --- a/NurSultan_deploy.yml +++ b/NurSultan_deploy.yml @@ -40,6 +40,7 @@ - http_healthcheck - redis - cert-redis + - maat-redis - certstore - telegraf_statistic # - tsg_device_tag @@ -77,8 +78,6 @@ - kernel-ml # - tsg-env-mcn3 - telegraf_collect - - redis - - maat-redis - mrzcpd - tfe diff --git a/NurSultan_install_config/group_vars/adc_global.yml b/NurSultan_install_config/group_vars/adc_global.yml index 63dd990..80e3f35 100644 --- a/NurSultan_install_config/group_vars/adc_global.yml +++ b/NurSultan_install_config/group_vars/adc_global.yml @@ -15,13 +15,13 @@ maat_redis_city_server: port: 7002 maat_redis_server: - address: "192.168.100.4" + address: "192.168.100.1" port: 7002 port_num: 1 db: 0 dynamic_maat_redis_server: - address: "192.168.100.4" + address: "192.168.100.1" port: 7002 port_num: 1 db: 1 diff --git a/roles/tsg-diagnose-uninstall/tasks/main.yml b/roles/tsg-diagnose-uninstall/tasks/main.yml new file mode 100644 index 0000000..eb799b3 --- /dev/null +++ b/roles/tsg-diagnose-uninstall/tasks/main.yml @@ -0,0 +1,9 @@ +- name: stop tsg-diagnose + systemd: + name: tsg-diagnose + state: stopped + +- name: remove the tsg-diagnose + yum: + name: tsg-diagnose + state: absent diff --git a/uninstall_process.yml b/uninstall_process.yml new file mode 100644 index 0000000..cad5be9 --- /dev/null +++ b/uninstall_process.yml @@ -0,0 +1,4 @@ +- hosts: adc_mcn0 + remote_user: root + roles: + - tsg-diagnose-uninstall