From a2a185b505da494e4b0d8b7924bbb6aa12cb5dad Mon Sep 17 00:00:00 2001 From: fumingwei Date: Wed, 25 Nov 2020 15:29:22 +0600 Subject: [PATCH] mv adc_deploy with tags to adc_deploy --- NurSultan_install_config/hosts.test | 49 ----------- adc_deploy.yml | 97 ++++++++++----------- adc_deploy.yml.without_tags | 130 ++++++++++++++++++++++++++++ 3 files changed, 178 insertions(+), 98 deletions(-) delete mode 100644 NurSultan_install_config/hosts.test create mode 100644 adc_deploy.yml.without_tags diff --git a/NurSultan_install_config/hosts.test b/NurSultan_install_config/hosts.test deleted file mode 100644 index d638951..0000000 --- a/NurSultan_install_config/hosts.test +++ /dev/null @@ -1,49 +0,0 @@ -################### -# 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_mxn] -10.4.55.65 -[adc_mcn0] -10.4.51.65 -[adc_mcn1] -10.4.52.65 -[adc_mcn2] -10.4.53.65 -[adc_mcn3] -10.4.54.65 -[packet_dump_server] -10.4.61.3 diff --git a/adc_deploy.yml b/adc_deploy.yml index 5e8fb7e..33a5b6f 100644 --- a/adc_deploy.yml +++ b/adc_deploy.yml @@ -1,8 +1,8 @@ - hosts: adc_mxn remote_user: root roles: - - adc_exporter - - adc_exporter_proxy + - {role: adc_exporter, tags: adc_exporter} + - {role: adc_exporter_proxy, tags: adc_exporter_proxy} - hosts: adc_mcn0 remote_user: root @@ -11,27 +11,26 @@ - '{{ 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 + - {role: framework, tags: framework} + - {role: kernel-ml, tags: kernel-ml} + - {role: mrzcpd, tags: mrzcpd} + - {role: sapp, tags: sapp} + - {role: tsg_master, tags: tsg_master} + - {role: kni, tags: kni} + - {role: firewall, tags: firewall} # - tsg_app - - http_healthcheck - - redis - - cert-redis - - maat-redis - - certstore - - telegraf_statistic - - app_proto_identify - - docker-env - - tsg-diagnose - - adc_exporter - - switch_control - - tsg-env-patch + - {role: http_healthcheck,tags: http_healthcheck} + - {role: redis, tags: redis} + - {role: cert-redis, tags: cert-redis} + - {role: maat-redis, tags: maat-redis} + - {role: certstore, tags: certstore} + - {role: telegraf_statistic, tags: telegraf_statistic} + - {role: app_proto_identify, tags: app_proto_identify} + - {role: docker-env, tags: docker-env} + - {role: tsg-diagnose, tags: tsg-diagnose} + - {role: adc_exporter, tags: adc_exporter} + - {role: switch_control, tags: switch_control} + - {role: tsg-env-patch, tags: tsg-env-patch} - hosts: adc_mcn1 remote_user: root @@ -41,14 +40,14 @@ - '{{ config_path }}/group_vars/adc_mcn1.yml' roles: # - tsg-env-mcn1 - - framework - - kernel-ml - - mrzcpd - - tfe - - tsg-diagnose_sync_ca - - adc_exporter - - switch_control - - tsg-env-patch + - {role: framework, tags: framework} + - {role: kernel-ml, tags: kernel-ml} + - {role: mrzcpd, tags: mrzcpd} + - {role: tfe, tags: tfe} + - {role: tsg-diagnose_sync_ca, tags: tsg-diagnose} + - {role: adc_exporter, tags: adc_exporter} + - {role: switch_control, tags: switch_control} + - {role: tsg-env-patch, tags: tsg-env-patch} - hosts: adc_mcn2 remote_user: root @@ -58,14 +57,14 @@ - '{{ config_path }}/group_vars/adc_mcn2.yml' roles: # - tsg-env-mcn2 - - framework - - kernel-ml - - mrzcpd - - tfe - - tsg-diagnose_sync_ca - - adc_exporter - - switch_control - - tsg-env-patch + - {role: framework, tags: framework} + - {role: kernel-ml, tags: kernel-ml} + - {role: mrzcpd, tags: mrzcpd} + - {role: tfe, tags: tfe} + - {role: tsg-diagnose_sync_ca, tags: tsg-diagnose} + - {role: adc_exporter, tags: adc_exporter} + - {role: switch_control, tags: switch_control} + - {role: tsg-env-patch, tags: tsg-env-path} - hosts: adc_mcn3 remote_user: root @@ -74,19 +73,19 @@ - '{{ config_path }}/group_vars/adc_global.yml' - '{{ config_path }}/group_vars/adc_mcn3.yml' roles: - - framework - - kernel-ml - - mrzcpd - - tfe - - tsg-diagnose_sync_ca - - adc_exporter - - switch_control - - tsg-env-patch + - {role: framework, tags: framework} + - {role: kernel-ml, tags: kernel-ml} + - {role: mrzcpd, tags: mrzcpd} + - {role: tfe, tags: tfe} + - {role: tsg-diagnose_sync_ca, tags: tsg-diagnose} + - {role: adc_exporter, tags: adc_exporter} + - {role: switch_control, tags: switch_control} + - {role: tsg-env-patch, tags: tsg-env-patch} - hosts: adc_mcn0 remote_user: root roles: - - tsg-diagnose_stop_sync + - {role: tsg-diagnose_stop_sync, tags: tsg-diagnose} - hosts: packet_dump_server remote_user: root @@ -94,8 +93,8 @@ - group_vars/adc_global_general.yml - '{{ config_path }}/group_vars/adc_global.yml' roles: - - framework - - packet_dump + - {role: framework, tags: framework} + - {role: packet_dump, tags: packet_dump} - hosts: server-as-tun-mode remote_user: root diff --git a/adc_deploy.yml.without_tags b/adc_deploy.yml.without_tags new file mode 100644 index 0000000..5e8fb7e --- /dev/null +++ b/adc_deploy.yml.without_tags @@ -0,0 +1,130 @@ +- hosts: adc_mxn + remote_user: root + roles: + - adc_exporter + - adc_exporter_proxy + +- 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 + - docker-env + - tsg-diagnose + - adc_exporter + - switch_control + - tsg-env-patch + +- 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 + - tsg-diagnose_sync_ca + - adc_exporter + - switch_control + - tsg-env-patch + +- 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 + - framework + - kernel-ml + - mrzcpd + - tfe + - tsg-diagnose_sync_ca + - adc_exporter + - switch_control + - tsg-env-patch + +- 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: + - framework + - kernel-ml + - mrzcpd + - tfe + - tsg-diagnose_sync_ca + - adc_exporter + - switch_control + - tsg-env-patch + +- hosts: adc_mcn0 + remote_user: root + roles: + - tsg-diagnose_stop_sync + +- 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: 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