20.11.rc3 rebase version 20.11

2021-01-31 22:43:40 +08:00
parent bcf5049ecb
commit 6dfaf41870
195 changed files with 2931 additions and 2149 deletions
--- a/roles/tsg-env-patch/files/replace_switch_non_block_with_nc_v2.patch
+++ b/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})
--- a/roles/tsg-env-patch/tasks/main.yml
+++ b/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
--- a/roles/tsg-env-patch/templates/maat-redis.conf.j2
+++ b/roles/tsg-env-patch/templates/maat-redis.conf.j2