1.add role tsg_env_patch

2.delete role which is unuseful

roles/maat-redis-uninstall/tasks/main.yml

@@ -1,20 +0,0 @@
-- name: "maat-redis-uninstall: stop maat-redis service"
-  systemd:
-    name: "{{ item }}"
-    state: stopped
-  with_items:
-    - maat-redis.service
-    - redis.service
-
-- name: "maat-redis-uninstall: rm maat-redis.conf and maat-redis.service"
-  file:
-    path: "{{ item }}"
-    state: absent
-  with_items:
-    - /etc/maat-redis.conf
-    - /usr/lib/systemd/system/maat-redis.service
-
-- name: remove redis
-  yum:
-    name: redis
-    state: absent

roles/reboot-adc-mcn-by-ipmitool/tasks/main.yml

@@ -1,8 +0,0 @@
-- 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 0x88 chassis power reset
-   - ipmitool -t 0x98 chassis power reset

roles/reboot-all-adc/tasks/main.yml

@@ -1,9 +0,0 @@
-- name: "reboot adc"
-  shell: "{{ item }}"
-  ignore_errors: true
-  with_items:
-   - ssh 192.168.100.1 reboot
-   - ssh 192.168.100.2 reboot
-   - ssh 192.168.100.3 reboot
-   - ssh 192.168.100.4 reboot
-   - reboot

roles/sapp_restart/tasks/main.yml

@@ -1,7 +0,0 @@
-- name: 'sapp service start'
-  systemd:
-    name: sapp
-    enabled: yes
-    daemon_reload: yes
-    state: restarted
-

roles/tfe_restart/tasks/main.yml

@@ -1,7 +0,0 @@
-- name: 'tfe service start'
-  systemd:
-    name: tfe
-    enabled: yes
-    daemon_reload: yes
-    state: restarted
-

roles/tsg-diagnose-uninstall/files/xz_docker.sh

@@ -1,7 +0,0 @@
-#!/bin/bash
-systemctl stop docker &&
-systemctl disable docker &&
-#执行不成功就把下面的注释
-#yum remove docker-ce &&
-rm -rf /var/lib/docker &&
-rm -rf $(whereis docker)

roles/tsg-diagnose-uninstall/tasks/main.yml

@@ -1,22 +0,0 @@
-- name: stop tsg-diagnose
-  systemd:
-    name: tsg-diagnose
-    state: stopped
-
-- name: docker-compose down
-  shell: cd /opt/tsg/tsg-diagnose/compose; docker-compose down; docker-compose down
-
-- name: remove the tsg-diagnose
-  yum:
-    name: tsg-diagnose
-    state: absent
-
-- name: copy origin uninstall docker shell file
-  copy:
-    src: "{{ role_path }}/files/"
-    dest: /tmp/ansible_deploy/
-    mode: 0755
-
-- name: rm docker-compose
-  shell: cd /tmp/ansible_deploy/; sh xz_docker.sh;rm /usr/local/bin/docker-compose
-

roles/tsg-env-patch/files/replace_switch_non_block_with_nc_v2.patch

@@ -0,0 +1,8 @@
+99c99
+<   ${CURRENT_PATH}/${REMOTE_CONTROL_BIN} -s ${TP_SVR} -n ${TP_PORT} -c "show version"
+---
+>   echo "show version" | nc ${TP_SVR} ${TP_PORT}
+136c136
+<   MAC_TABLE=`${CURRENT_PATH}/${REMOTE_CONTROL_BIN} -s ${TP_SVR} -n ${TP_PORT} -c "show mac table all"`
+---
+>   MAC_TABLE=$(echo "show mac table all" | nc ${TP_SVR} ${TP_PORT})

roles/tsg-env-patch/tasks/main.yml

@@ -0,0 +1,5 @@
+- name: "patch setup scripts in tsg-env"
+  patch:
+    src: "{{ role_path }}/files/replace_switch_non_block_with_nc_v2.patch"
+    dest: /opt/tsg/env/setup
+    backup: true