1、commit the file privilege that is changedtsg-deploy-K18-in-KZ

2、add function that is to reboot and  stop device manager in mxn

20 files changed, 133 insertions, 2 deletions

diff --git a/Petropavl_install_config/hosts-except.14.30 b/Petropavl_install_config/hosts-except.14.30
new file mode 100644
index 0000000..d9ff594
--- /dev/null
+++ b/Petropavl_install_config/hosts-except.14.30
@@ -0,0 +1,51 @@
+###################
+#   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.11.54.30 !!!
+# 10.11.51.14 !!!
+[adc_mxn]
+10.11.55.[1:30]
+[adc_mcn0]
+10.11.51.[1:13]
+10.11.51.[15:30]
+[adc_mcn1]
+10.11.52.[1:30]
+[adc_mcn2]
+10.11.53.[1:30]
+[adc_mcn3]
+10.11.54.[1:30]
+[packet_dump_server]
+10.11.61.3
diff --git a/Petropavl_install_config/hosts.test b/Petropavl_install_config/hosts.test
new file mode 100644
index 0000000..3b90027
--- /dev/null
+++ b/Petropavl_install_config/hosts.test
@@ -0,0 +1,50 @@
+###################
+#   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.11.54.30 !!!
+# 10.11.51.14 !!!
+[adc_mxn]
+10.11.55.[1:30]
+[adc_mcn0]
+10.11.51.[1:30]
+[adc_mcn1]
+10.11.52.[1:30]
+[adc_mcn2]
+10.11.53.[1:30]
+[adc_mcn3]
+10.11.54.[1:30]
+[packet_dump_server]
+10.11.61.3
diff --git a/Shymkent_install_config/hosts b/Shymkent_install_config/hosts
index f924e79..fb2ee87 100644
--- a/Shymkent_install_config/hosts
+++ b/Shymkent_install_config/hosts
@@ -43,8 +43,8 @@
 [adc_mcn1]

 10.13.52.[1:59]

 [adc_mcn2]

-10.13.53.[1:58]

+10.13.53.[1:59]

 [adc_mcn3]

-10.13.54.[1:54]

+10.13.54.[1:59]

 [packet_dump_server]

 10.13.61.8

diff --git a/cmd3.txt b/cmd3.txt
new file mode 100644
index 0000000..dcc9b85
--- /dev/null
+++ b/cmd3.txt
@@ -0,0 +1,3 @@
+ansible-playbook   -i UstKamenogorsk_install_config/hosts  -e "config_path=UstKamenogorsk_install_config"  -l adc_mcn0 -t  firewall    adc_deploy.yml -f 100
+ansible-playbook   -i NurSultan_install_config/hosts  tasks/restart_process/restart_sapp.yml -f 100
+ansible-playbook   -i NurSultan_install_config/hosts  tasks/verify/verify_tsg_diagnose_once.yml -f 100
diff --git a/deploy_all_citys.sh b/deploy_all_citys.sh
index 21c3cc5..21c3cc5 100755..100644
--- a/deploy_all_citys.sh
+++ b/deploy_all_citys.sh
diff --git a/roles/adc_exporter/files/ipmi_exporter b/roles/adc_exporter/files/ipmi_exporter
index f57b94a..f57b94a 100755..100644
--- a/roles/adc_exporter/files/ipmi_exporter
+++ b/roles/adc_exporter/files/ipmi_exporter
diff --git a/roles/adc_exporter/files/node_exporter b/roles/adc_exporter/files/node_exporter
index b0a8b64..b0a8b64 100755..100644
--- a/roles/adc_exporter/files/node_exporter
+++ b/roles/adc_exporter/files/node_exporter
diff --git a/roles/adc_exporter/files/systemd_exporter b/roles/adc_exporter/files/systemd_exporter
index b075967..b075967 100755..100644
--- a/roles/adc_exporter/files/systemd_exporter
+++ b/roles/adc_exporter/files/systemd_exporter
diff --git a/roles/adc_exporter_ping/files/ping_exporter b/roles/adc_exporter_ping/files/ping_exporter
index a2915fd..a2915fd 100755..100644
--- a/roles/adc_exporter_ping/files/ping_exporter
+++ b/roles/adc_exporter_ping/files/ping_exporter
diff --git a/roles/kni/files/kni-20.10.20201024.a43de2a-2.el7.x86_64.rpm b/roles/kni/files/kni-20.10.20201024.a43de2a-2.el7.x86_64.rpm
index fd7bfaa..fd7bfaa 100755..100644
--- a/roles/kni/files/kni-20.10.20201024.a43de2a-2.el7.x86_64.rpm
+++ b/roles/kni/files/kni-20.10.20201024.a43de2a-2.el7.x86_64.rpm
diff --git a/roles/packet_dump/files/systemd_exporter b/roles/packet_dump/files/systemd_exporter
index b075967..b075967 100755..100644
--- a/roles/packet_dump/files/systemd_exporter
+++ b/roles/packet_dump/files/systemd_exporter
diff --git a/roles/redis/files/redis_exporter b/roles/redis/files/redis_exporter
index 4a6fe69..4a6fe69 100755..100644
--- a/roles/redis/files/redis_exporter
+++ b/roles/redis/files/redis_exporter
diff --git a/roles/sapp/files/tera_fake_promisc_setup.sh b/roles/sapp/files/tera_fake_promisc_setup.sh
index 4e8665a..4e8665a 100755..100644
--- a/roles/sapp/files/tera_fake_promisc_setup.sh
+++ b/roles/sapp/files/tera_fake_promisc_setup.sh
diff --git a/roles/switch_control/files/switch_control_client_non_block b/roles/switch_control/files/switch_control_client_non_block
index cb34506..cb34506 100755..100644
--- a/roles/switch_control/files/switch_control_client_non_block
+++ b/roles/switch_control/files/switch_control_client_non_block
diff --git a/roles/switch_rule/files/saved_startup b/roles/switch_rule/files/saved_startup
index 8eded30..8eded30 100755..100644
--- a/roles/switch_rule/files/saved_startup
+++ b/roles/switch_rule/files/saved_startup
diff --git a/stop_disable_device_manager.cmd b/stop_disable_device_manager.cmd
new file mode 100644
index 0000000..de2eb92
--- /dev/null
+++ b/stop_disable_device_manager.cmd
@@ -0,0 +1 @@
+ansible-playbook -i NurSultan_install_config/hosts tasks/stop_disable_device_manager/stop_disable_device_manager.yml
diff --git a/tasks/reboot/reboot_adc.yml b/tasks/reboot/reboot_adc.yml
index db38bac..3b95a92 100644
--- a/tasks/reboot/reboot_adc.yml
+++ b/tasks/reboot/reboot_adc.yml
@@ -1,4 +1,5 @@
 - hosts: 
+    - adc_mxn
     - adc_mcn0
     - adc_mcn1
     - adc_mcn2
diff --git a/tasks/reboot/reboot_adc_mxn_mcn_by_ipmitool.yml b/tasks/reboot/reboot_adc_mxn_mcn_by_ipmitool.yml
new file mode 100644
index 0000000..3f1b235
--- /dev/null
+++ b/tasks/reboot/reboot_adc_mxn_mcn_by_ipmitool.yml
@@ -0,0 +1,12 @@
+- hosts: adc_mxn
+  remote_user: root
+  tasks:
+    - name: "reboot adc in mxn by ipmitool"
+      shell: "{{ item }}"
+      ignore_errors: true
+      with_items:
+       - ipmitool -t 0x90 chassis power reset
+       - ipmitool -t 0x80 chassis power reset
+       - ipmitool -t 0x98 chassis power reset
+       - ipmitool -t 0x88 chassis power reset
+       - reboot
diff --git a/tasks/stop_disable_device_manager/stop_disable_device_manager.yml b/tasks/stop_disable_device_manager/stop_disable_device_manager.yml
new file mode 100644
index 0000000..183bd18
--- /dev/null
+++ b/tasks/stop_disable_device_manager/stop_disable_device_manager.yml
@@ -0,0 +1,12 @@
+- hosts: adc_mxn
+  remote_user: root
+  tasks:
+    - name: "oam stop and disable: stop oam_core, oam_snmp service, tsg-monitor"
+      systemd:
+        name: "{{ item }}"
+        state: stopped
+        enabled: no
+      with_items:
+        - oam_core.service
+        - oam_snmp.service
+        - tsg-monitor.service
diff --git a/tasks/stop_telegraf_collect.yml b/tasks/stop_telegraf_collect.yml
index 3c3f2b4..5a884d1 100644
--- a/tasks/stop_telegraf_collect.yml
+++ b/tasks/stop_telegraf_collect.yml
@@ -10,6 +10,7 @@
         name: telegraf_collect

         state: stopped

         enabled: no

+      ignore_errors: yes

 

     - name: 'telegraf_collect config file and service file'

       shell: rm /etc/telegraf/telegraf_collect.conf; rm /usr/lib/systemd/system/telegraf_collect.service; systemctl daemon-reload