From acd37d3fdd96c69c3c5eeee191e399e7f3d71fa1 Mon Sep 17 00:00:00 2001 From: fumingwei Date: Thu, 19 Nov 2020 09:08:55 +0600 Subject: [PATCH] 1. add start and stop tsg-diagnose --- NurSultan_install_config/hosts.ce | 41 ++++++++ adc_deploy.yml | 84 ++++----------- adc_deploy.yml.edit | 169 ------------------------------ tasks/start_tsg_diagnose.yml | 8 ++ tasks/stop_tsg_diagnose.yml | 5 +- 5 files changed, 70 insertions(+), 237 deletions(-) create mode 100644 NurSultan_install_config/hosts.ce delete mode 100644 adc_deploy.yml.edit create mode 100644 tasks/start_tsg_diagnose.yml diff --git a/NurSultan_install_config/hosts.ce b/NurSultan_install_config/hosts.ce new file mode 100644 index 0000000..d2abd15 --- /dev/null +++ b/NurSultan_install_config/hosts.ce @@ -0,0 +1,41 @@ +################### +# For example # +################### +#变量device_id根据设备序号设置即可 +#变量vvipv4_1、vvipv4_2、vvipv6_1、vvipv6_2为Allot相关配置，其他环境可不填或直接删除变量 +# +#20.09版本新增APP部署 +#[app_global] +#0.0.0.0 + +#[server-as-tun-mode] +#1.1.1.1 device_id=device_1 +# +#[adc_mxn] +#10.3.72.1 +#10.3.72.2 +# +#[adc_mcn0] +#10.3.73.1 device_id=device_1 vvipv4_1=10.3.61.1 vvipv4_2=10.3.62.1 vvipv6_1=fc00::61:1 vvipv6_2=fc00::62:1 +#10.3.73.2 device_id=device_2 vvipv4_1=10.3.61.2 vvipv4_2=10.3.62.2 vvipv6_1=fc00::61:2 vvipv6_2=fc00::62:2 +# +#[adc_mcn1] +#10.3.74.1 device_id=device_1 +#10.3.74.2 device_id=device_2 +# +#[adc_mcn2] +#10.3.75.1 device_id=device_1 +#10.3.75.2 device_id=device_2 +# +#[adc_mcn3] +#10.3.76.1 device_id=device_1 +#10.3.76.2 device_id=device_2 + +#[app_global] +#[server-as-tun-mode] +#broken warning: +#10.4.52.71 +[adc_mcn0] +10.4.51.[21:22] +10.4.51.[53:54] + diff --git a/adc_deploy.yml b/adc_deploy.yml index 78f670c..d602c7a 100644 --- a/adc_deploy.yml +++ b/adc_deploy.yml @@ -1,28 +1,17 @@ -- hosts: - - adc_mcn0 - - adc_mcn1 - - adc_mcn2 - - adc_mcn3 - - packet_dump_server - remote_user: root - vars_files: - - group_vars/adc_global_general.yml - - '{{ config_path }}/group_vars/adc_global.yml' - roles: - - framework - - hosts: packet_dump_server remote_user: root vars_files: - group_vars/adc_global_general.yml - '{{ config_path }}/group_vars/adc_global.yml' roles: + - framework - packet_dump - hosts: adc_mxn remote_user: root roles: -# - tsg-env-mxn + - adc_exporter + - adc_exporter_proxy - hosts: adc_mcn0 remote_user: root @@ -32,6 +21,7 @@ - '{{ config_path }}/group_vars/adc_mcn0.yml' roles: # - tsg-env-mcn0 + - framework - kernel-ml - mrzcpd - sapp @@ -46,7 +36,10 @@ - certstore - telegraf_statistic - app_proto_identify -# - tsg_device_tag + - docker-env + - tsg-diagnose + - adc_exporter + - switch_control - hosts: adc_mcn1 remote_user: root @@ -56,9 +49,13 @@ - '{{ config_path }}/group_vars/adc_mcn1.yml' roles: # - tsg-env-mcn1 + - framework - kernel-ml - mrzcpd - tfe + - tsg-diagnose_sync_ca + - adc_exporter + - switch_control - hosts: adc_mcn2 remote_user: root @@ -68,9 +65,13 @@ - '{{ config_path }}/group_vars/adc_mcn2.yml' roles: # - tsg-env-mcn2 + - framework - kernel-ml - mrzcpd - tfe + - tsg-diagnose_sync_ca + - adc_exporter + - switch_control - hosts: adc_mcn3 remote_user: root @@ -79,66 +80,19 @@ - '{{ config_path }}/group_vars/adc_global.yml' - '{{ config_path }}/group_vars/adc_mcn3.yml' roles: + - framework - kernel-ml -# - tsg-env-mcn3 - mrzcpd - tfe - -- hosts: adc_mcn0 - remote_user: root - roles: - - docker-env - - tsg-diagnose - -- hosts: - - adc_mcn1 - - adc_mcn2 - - adc_mcn3 - remote_user: root - roles: - tsg-diagnose_sync_ca + - adc_exporter + - switch_control - hosts: adc_mcn0 remote_user: root roles: - tsg-diagnose_stop_sync -- hosts: - - adc_mcn0 - - adc_mcn1 - - adc_mcn2 - - adc_mcn3 - remote_user: root - vars_files: - - group_vars/adc_global_general.yml - - '{{ config_path }}/group_vars/adc_global.yml' - roles: - #- reboot - -- hosts: - - adc_mxn - - adc_mcn0 - - adc_mcn1 - - adc_mcn2 - - adc_mcn3 - remote_user: root - roles: - - adc_exporter - -- hosts: adc_mxn - remote_user: root - roles: - - adc_exporter_proxy - -- hosts: - - adc_mcn0 - - adc_mcn1 - - adc_mcn2 - - adc_mcn3 - remote_user: root - roles: - - switch_control - - hosts: server-as-tun-mode remote_user: root vars_files: diff --git a/adc_deploy.yml.edit b/adc_deploy.yml.edit deleted file mode 100644 index 250ee9a..0000000 --- a/adc_deploy.yml.edit +++ /dev/null @@ -1,169 +0,0 @@ -- hosts: - - adc_mcn1 - - adc_mcn2 - - adc_mcn3 - remote_user: root - vars_files: - - group_vars/adc_global_general.yml - - '{{ config_path }}/group_vars/adc_global.yml' - roles: - - framework - -- hosts: packet_dump_server - remote_user: root - vars_files: - - group_vars/adc_global_general.yml - - '{{ config_path }}/group_vars/adc_global.yml' - roles: - - framework - - packet_dump - -- hosts: adc_mcn0 - remote_user: root - vars_files: - - group_vars/adc_global_general.yml - - '{{ config_path }}/group_vars/adc_global.yml' - - '{{ config_path }}/group_vars/adc_mcn0.yml' - roles: -# - tsg-env-mcn0 - - framework - - kernel-ml - - mrzcpd - - sapp - - tsg_master - - kni - - firewall -# - tsg_app - - http_healthcheck - - redis - - cert-redis - - maat-redis - - certstore - - telegraf_statistic - - app_proto_identify -# - tsg_device_tag - -- hosts: adc_mcn1 - remote_user: root - vars_files: - - group_vars/adc_global_general.yml - - '{{ config_path }}/group_vars/adc_global.yml' - - '{{ config_path }}/group_vars/adc_mcn1.yml' - roles: -# - tsg-env-mcn1 - - framework - - kernel-ml - - mrzcpd - - tfe - -- hosts: adc_mcn2 - remote_user: root - vars_files: - - group_vars/adc_global_general.yml - - '{{ config_path }}/group_vars/adc_global.yml' - - '{{ config_path }}/group_vars/adc_mcn2.yml' - roles: -# - tsg-env-mcn2 - - kernel-ml - - mrzcpd - - tfe - - -- hosts: adc_mcn3 - remote_user: root - vars_files: - - group_vars/adc_global_general.yml - - '{{ config_path }}/group_vars/adc_global.yml' - - '{{ config_path }}/group_vars/adc_mcn3.yml' - roles: - - kernel-ml -# - tsg-env-mcn3 - - mrzcpd - - tfe - -- hosts: adc_mcn0 - remote_user: root - roles: - - docker-env - - tsg-diagnose - -- hosts: - - adc_mcn1 - - adc_mcn2 - - adc_mcn3 - remote_user: root - roles: - - tsg-diagnose_sync_ca - -- hosts: adc_mcn0 - remote_user: root - roles: - - tsg-diagnose_stop_sync - -- hosts: - - adc_mcn0 - - adc_mcn1 - - adc_mcn2 - - adc_mcn3 - remote_user: root - vars_files: - - group_vars/adc_global_general.yml - - '{{ config_path }}/group_vars/adc_global.yml' - roles: - #- reboot - -- hosts: - - adc_mxn - - adc_mcn0 - - adc_mcn1 - - adc_mcn2 - - adc_mcn3 - remote_user: root - roles: - - adc_exporter - -- hosts: adc_mxn - remote_user: root - roles: - - adc_exporter_proxy - -- hosts: - - adc_mcn0 - - adc_mcn1 - - adc_mcn2 - - adc_mcn3 - remote_user: root - roles: - - switch_control - -- hosts: server-as-tun-mode - remote_user: root - vars_files: - - '{{ config_path }}/group_vars/server_as_tun_mode.yml' - roles: - - kernel-ml - - framework - - mrzcpd - - tsg-env-tun-mode - - sapp - - tsg_master - - kni - - firewall - - tsg_app - - http_healthcheck - - certstore - - redis - - cert-redis - - maat-redis - - tfe - - telegraf_statistic - - proxy_status -# - tsg_device_tag - - reboot - -- hosts: app_global - remote_user: root - vars_files: - - '{{ config_path }}/group_vars/app_global.yml' - roles: - - app_global diff --git a/tasks/start_tsg_diagnose.yml b/tasks/start_tsg_diagnose.yml new file mode 100644 index 0000000..791e97b --- /dev/null +++ b/tasks/start_tsg_diagnose.yml @@ -0,0 +1,8 @@ +- hosts: adc_mcn0 + remote_user: root + tasks: + - name: 'mcn0 start tsg-diagnose service' + systemd: + name: tsg-diagnose + state: started + enabled: yes diff --git a/tasks/stop_tsg_diagnose.yml b/tasks/stop_tsg_diagnose.yml index 15b9285..8a1b6b2 100644 --- a/tasks/stop_tsg_diagnose.yml +++ b/tasks/stop_tsg_diagnose.yml @@ -1,6 +1,5 @@ -- hosts: - - adc_mcn0 - remote_user: root +- hosts: adc_mcn0 + remote_user: root tasks: - name: 'mcn0 stop tsg-diagnose service' systemd: