20.11.rc3 rebase version 20.11dpi-version20.11.rc3-deploy

1 files changed, 26 insertions, 23 deletions

diff --git a/server_deploy.yml b/server_deploy.yml
index e8721f7..3a73772 100644
--- a/server_deploy.yml
+++ b/server_deploy.yml
@@ -3,37 +3,40 @@
   vars_files:
     - 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
-    - telegraf_collect
-    - tsg_device_tag
-    - reboot
+    - {role: framework, tags: framework}
+    - {role: kernel-ml, tags: kernel-ml}
+    - {role: mrzcpd, tags: mrzcpd}
+    - {role: tsg-env-tun-mode, tags: tsg-env-tun-mode}
+    - {role: sapp, tags: sapp}
+    - {role: tsg_master, tags: tsg_master}
+    - {role: kni, tags: kni}
+    - {role: firewall, tags: firewall}
+    - {role: tsg_app, tags: tsg_app}
+    - {role: http_healthcheck,tags: http_healthcheck}
+    - {role: certstore, tags: certstore}
+    - {role: redis, tags: redis}
+    - {role: cert-redis, tags: cert-redis}
+    - {role: maat-redis, tags: maat-redis, when: deploy_mode == "cluster"}
+    - {role: tfe, tags: tfe}
+    - {role: telegraf_statistic, tags: telegraf_statistic}
+    - {role: app_proto_identify, tags: app_proto_identify}
+#    - {role: proxy_status, tags: proxy_status}
+#    - {role: adc_exporter, tags: adc_exporter}
+#    - {role: adc_exporter_proxy, tags: adc_exporter_proxy}
+#    - tsg_device_tag
+#    - reboot
 
 - hosts: packet_dump_server
   remote_user: root
   vars_files:
-    - install_config/group_vars/server_as_tun_mode.yml
+    - install_config/group_vars/adc_global.yml
   roles:
-    - framework
-    - packet_dump
+    - {role: framework, tags: framework}
+    - {role: packet_dump, tags: packet_dump}
 
 - hosts: app_global
   remote_user: root
   vars_files:
     - install_config/group_vars/app_global.yml
   roles:
-    - app_global
+    - {role: app_global, tags: app_global}