diff --git a/Atyrau_deploy.yml b/Atyrau_install_config/Atyrau_deploy.yml similarity index 100% rename from Atyrau_deploy.yml rename to Atyrau_install_config/Atyrau_deploy.yml diff --git a/Deploy_test.yml b/Deploy_test.yml deleted file mode 100644 index c658397..0000000 --- a/Deploy_test.yml +++ /dev/null @@ -1,165 +0,0 @@ -- hosts: - - adc_mcn0 - - adc_mcn1 - - adc_mcn2 - - adc_mcn3 - - packet_dump_server - remote_user: root - vars_files: - - Almaty_install_config/group_vars/adc_global.yml - roles: - - framework - -- hosts: packet_dump_server - remote_user: root - vars_files: - - Almaty_install_config/group_vars/adc_global.yml - roles: - - packet_dump - -- hosts: adc_mxn - remote_user: root - roles: -# - tsg-env-mxn - -- hosts: adc_mcn0 - remote_user: root - vars_files: - - Almaty_install_config/group_vars/adc_global.yml - - Almaty_install_config/group_vars/adc_mcn0.yml - roles: -# - tsg-env-mcn0 - - 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: - - Almaty_install_config/group_vars/adc_global.yml - - Almaty_install_config/group_vars/adc_mcn1.yml - roles: -# - tsg-env-mcn1 - - kernel-ml - - mrzcpd - - tfe - -- hosts: adc_mcn2 - remote_user: root - vars_files: - - Almaty_install_config/group_vars/adc_global.yml - - Almaty_install_config/group_vars/adc_mcn2.yml - roles: -# - tsg-env-mcn2 - - kernel-ml - - mrzcpd - - tfe - -- hosts: adc_mcn3 - remote_user: root - vars_files: - - Almaty_install_config/group_vars/adc_global.yml - - Almaty_install_config/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: - - Almaty_install_config/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: - - Almaty_install_config/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: - - Almaty_install_config/group_vars/app_global.yml - roles: - - app_global diff --git a/Kostanay_install_config/hosts.ok b/Kostanay_install_config/hosts.ok deleted file mode 100644 index fbc1a35..0000000 --- a/Kostanay_install_config/hosts.ok +++ /dev/null @@ -1,59 +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.[1:20] -10.4.55.[23:52] -10.4.55.[55:78] -[adc_mcn0] -10.4.51.[1:20] -10.4.51.[23:52] -10.4.51.[55:78] -[adc_mcn1] -10.4.52.[1:20] -10.4.52.[23:52] -10.4.52.[55:78] -[adc_mcn2] -10.4.53.[1:20] -10.4.53.[23:52] -10.4.53.[55:78] -[adc_mcn3] -10.4.54.[1:20] -10.4.54.[23:52] -10.4.54.[55:78] -[packet_dump_server] -10.4.61.3 diff --git a/Semey_install_config/hosts.ok b/Semey_install_config/hosts.ok deleted file mode 100644 index fbc1a35..0000000 --- a/Semey_install_config/hosts.ok +++ /dev/null @@ -1,59 +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.[1:20] -10.4.55.[23:52] -10.4.55.[55:78] -[adc_mcn0] -10.4.51.[1:20] -10.4.51.[23:52] -10.4.51.[55:78] -[adc_mcn1] -10.4.52.[1:20] -10.4.52.[23:52] -10.4.52.[55:78] -[adc_mcn2] -10.4.53.[1:20] -10.4.53.[23:52] -10.4.53.[55:78] -[adc_mcn3] -10.4.54.[1:20] -10.4.54.[23:52] -10.4.54.[55:78] -[packet_dump_server] -10.4.61.3 diff --git a/Shymkent_install_config/hosts.ok b/Shymkent_install_config/hosts.ok deleted file mode 100644 index fbc1a35..0000000 --- a/Shymkent_install_config/hosts.ok +++ /dev/null @@ -1,59 +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.[1:20] -10.4.55.[23:52] -10.4.55.[55:78] -[adc_mcn0] -10.4.51.[1:20] -10.4.51.[23:52] -10.4.51.[55:78] -[adc_mcn1] -10.4.52.[1:20] -10.4.52.[23:52] -10.4.52.[55:78] -[adc_mcn2] -10.4.53.[1:20] -10.4.53.[23:52] -10.4.53.[55:78] -[adc_mcn3] -10.4.54.[1:20] -10.4.54.[23:52] -10.4.54.[55:78] -[packet_dump_server] -10.4.61.3 diff --git a/Aktau_deploy.yml b/backup_deploy_yml_file/Aktau_deploy.yml similarity index 100% rename from Aktau_deploy.yml rename to backup_deploy_yml_file/Aktau_deploy.yml diff --git a/Aktubinsk_deploy.yml b/backup_deploy_yml_file/Aktubinsk_deploy.yml similarity index 100% rename from Aktubinsk_deploy.yml rename to backup_deploy_yml_file/Aktubinsk_deploy.yml diff --git a/Almaty_deploy.yml b/backup_deploy_yml_file/Almaty_deploy.yml similarity index 100% rename from Almaty_deploy.yml rename to backup_deploy_yml_file/Almaty_deploy.yml diff --git a/Karaganda_deploy.yml b/backup_deploy_yml_file/Karaganda_deploy.yml similarity index 100% rename from Karaganda_deploy.yml rename to backup_deploy_yml_file/Karaganda_deploy.yml diff --git a/Kyzylorda_deploy.yml b/backup_deploy_yml_file/Kyzylorda_deploy.yml similarity index 100% rename from Kyzylorda_deploy.yml rename to backup_deploy_yml_file/Kyzylorda_deploy.yml diff --git a/NurSultan_deploy.yml b/backup_deploy_yml_file/NurSultan_deploy.yml similarity index 100% rename from NurSultan_deploy.yml rename to backup_deploy_yml_file/NurSultan_deploy.yml diff --git a/Taldykurgan_deploy.yml b/backup_deploy_yml_file/Taldykurgan_deploy.yml similarity index 100% rename from Taldykurgan_deploy.yml rename to backup_deploy_yml_file/Taldykurgan_deploy.yml diff --git a/Uralsk_deploy.yml b/backup_deploy_yml_file/Uralsk_deploy.yml similarity index 100% rename from Uralsk_deploy.yml rename to backup_deploy_yml_file/Uralsk_deploy.yml diff --git a/deploy_framework_firewall_tfe.yml b/deploy_framework_firewall_tfe.yml deleted file mode 100644 index def8b03..0000000 --- a/deploy_framework_firewall_tfe.yml +++ /dev/null @@ -1,51 +0,0 @@ -- hosts: packet_dump_server - remote_user: root - vars_files: - - group_vars/adc_global_general.yml - - '{{ config_path }}/group_vars/adc_global.yml' - roles: - - framework - -- 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 - - firewall - -- 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 - - 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 - - framework - - 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: - - framework - - tfe - diff --git a/deploy_sapp_firewall_kni.yml b/deploy_sapp_firewall_kni.yml deleted file mode 100644 index 884bfe5..0000000 --- a/deploy_sapp_firewall_kni.yml +++ /dev/null @@ -1,11 +0,0 @@ -- hosts: adc_mcn0 - remote_user: root - vars_files: - - '{{ config_path }}/group_vars/adc_global.yml' - - '{{ config_path }}/group_vars/adc_mcn0.yml' - roles: - - sapp - - tsg_master - - kni - - firewall - diff --git a/tasks/start_tsg_diagnose.yml b/tasks/option-tsg-diagnose/start_tsg_diagnose.yml similarity index 100% rename from tasks/start_tsg_diagnose.yml rename to tasks/option-tsg-diagnose/start_tsg_diagnose.yml diff --git a/tasks/stop_tsg_diagnose.yml b/tasks/option-tsg-diagnose/stop_tsg_diagnose.yml similarity index 100% rename from tasks/stop_tsg_diagnose.yml rename to tasks/option-tsg-diagnose/stop_tsg_diagnose.yml diff --git a/tasks/reboot_adc.yml b/tasks/reboot/reboot_adc.yml similarity index 100% rename from tasks/reboot_adc.yml rename to tasks/reboot/reboot_adc.yml diff --git a/tasks/reboot_adc_mcn_by_ipmitool.yml b/tasks/reboot/reboot_adc_mcn_by_ipmitool.yml similarity index 100% rename from tasks/reboot_adc_mcn_by_ipmitool.yml rename to tasks/reboot/reboot_adc_mcn_by_ipmitool.yml diff --git a/tasks/reboot_adc_mcn_by_ssh.yml b/tasks/reboot/reboot_adc_mcn_by_ssh.yml similarity index 100% rename from tasks/reboot_adc_mcn_by_ssh.yml rename to tasks/reboot/reboot_adc_mcn_by_ssh.yml diff --git a/tasks/uninstall_maat_redis.yml b/tasks/uninstall/uninstall_maat_redis.yml similarity index 100% rename from tasks/uninstall_maat_redis.yml rename to tasks/uninstall/uninstall_maat_redis.yml diff --git a/tasks/uninstall_node-exporter.yml b/tasks/uninstall/uninstall_node-exporter.yml similarity index 100% rename from tasks/uninstall_node-exporter.yml rename to tasks/uninstall/uninstall_node-exporter.yml diff --git a/tasks/uninstall_redis40u.yml b/tasks/uninstall/uninstall_redis40u.yml similarity index 100% rename from tasks/uninstall_redis40u.yml rename to tasks/uninstall/uninstall_redis40u.yml diff --git a/tasks/uninstall_rpm_node-exporter.yml b/tasks/uninstall/uninstall_rpm_node-exporter.yml similarity index 100% rename from tasks/uninstall_rpm_node-exporter.yml rename to tasks/uninstall/uninstall_rpm_node-exporter.yml diff --git a/tasks/verify_process_md5_hash.yml b/tasks/verify/verify_process_md5_hash.yml similarity index 100% rename from tasks/verify_process_md5_hash.yml rename to tasks/verify/verify_process_md5_hash.yml diff --git a/tasks/verify_systemctl_sapp.yml b/tasks/verify/verify_systemctl_sapp.yml similarity index 100% rename from tasks/verify_systemctl_sapp.yml rename to tasks/verify/verify_systemctl_sapp.yml diff --git a/tasks/verify_systemctl_tfe.yml b/tasks/verify/verify_systemctl_tfe.yml similarity index 100% rename from tasks/verify_systemctl_tfe.yml rename to tasks/verify/verify_systemctl_tfe.yml diff --git a/tasks/verify_tfe_md5_hash.yml b/tasks/verify/verify_tfe_md5_hash.yml similarity index 100% rename from tasks/verify_tfe_md5_hash.yml rename to tasks/verify/verify_tfe_md5_hash.yml diff --git a/tasks/verify_tsg_diagnose.yml b/tasks/verify/verify_tsg_diagnose.yml similarity index 100% rename from tasks/verify_tsg_diagnose.yml rename to tasks/verify/verify_tsg_diagnose.yml diff --git a/tasks/verify_tsg_diagnose_once.yml b/tasks/verify/verify_tsg_diagnose_once.yml similarity index 100% rename from tasks/verify_tsg_diagnose_once.yml rename to tasks/verify/verify_tsg_diagnose_once.yml diff --git a/tsg_env_patch.yml b/tsg_env_patch.yml deleted file mode 100644 index ceee724..0000000 --- a/tsg_env_patch.yml +++ /dev/null @@ -1,8 +0,0 @@ -- hosts: - - adc_mcn0 - - adc_mcn1 - - adc_mcn2 - - adc_mcn3 - remote_user: root - roles: - - tsg-env-patch