diff --git a/deploy.yml b/deploy.yml index 555c16a..9a7ee8d 100644 --- a/deploy.yml +++ b/deploy.yml @@ -1,3 +1,13 @@ +- hosts: + - adc_mcn0 + - adc_mcn1 + - adc_mcn2 + - adc_mcn3 + remote_user: root + roles: + - framework + - kernel-ml + - hosts: adc_mxn remote_user: root roles: @@ -10,8 +20,6 @@ - install_config/group_vars/adc_mcn0.yml roles: # - tsg-env-mcn0 - - framework - - kernel-ml - mrzcpd - sapp - tsg_master @@ -32,8 +40,6 @@ - install_config/group_vars/adc_mcn1.yml roles: # - tsg-env-mcn1 - - framework - - kernel-ml - mrzcpd - tfe @@ -44,8 +50,6 @@ - install_config/group_vars/adc_mcn2.yml roles: # - tsg-env-mcn2 - - framework - - kernel-ml - mrzcpd - tfe @@ -56,8 +60,6 @@ - install_config/group_vars/adc_mcn3.yml roles: # - tsg-env-mcn3 - - framework - - kernel-ml - mrzcpd - tfe @@ -85,10 +87,10 @@ - adc_mcn2 - adc_mcn3 remote_user: root - roles: - - reboot vars_files: - install_config/group_vars/adc_global.yml + roles: + - reboot - hosts: server-as-tun-mode remote_user: root diff --git a/roles/mrzcpd/templates/traffic_mirror/mrglobal.conf.traffic_mirror.j2 b/roles/mrzcpd/templates/traffic_mirror/mrglobal.conf.traffic_mirror.j2 index 06dd785..a6820d7 100644 --- a/roles/mrzcpd/templates/traffic_mirror/mrglobal.conf.traffic_mirror.j2 +++ b/roles/mrzcpd/templates/traffic_mirror/mrglobal.conf.traffic_mirror.j2 @@ -1,5 +1,5 @@ [device] -device=fake +device={{nic_traffic_mirror.name}} sz_tunnel=8192 sz_buffer=0 diff --git a/roles/sapp/templates/sapp.toml.j2 b/roles/sapp/templates/sapp.toml.j2 index 57d4283..d763260 100644 --- a/roles/sapp/templates/sapp.toml.j2 +++ b/roles/sapp/templates/sapp.toml.j2 @@ -14,9 +14,7 @@ worker_threads=1 {% else %} worker_threads={{ sapp.worker_threads }} {% endif %} -{% if tsg_access_type == 4 %} send_only_threads_max={{ sapp.send_only_threads_max }} -{% endif %} ### note, bind_mask, if you do not want to bind thread to special CPU core, keep it empty as [] {% if tsg_access_type == 0 %} bind_mask=[] diff --git a/uninstall/roles/package_list/20.09.yml b/uninstall/roles/package_list/20.09.yml index 7a9f351..8251d1e 100644 --- a/uninstall/roles/package_list/20.09.yml +++ b/uninstall/roles/package_list/20.09.yml @@ -58,7 +58,7 @@ fw_http: fw_http_plug-3.0.0.1ca1c65-1.x86_64 fw_quic: fw_quic_plug-3.0.0.b06d39c-1.x86_64 fw_ssl: fw_ssl_plug-3.0.1.7ea9976-1.x86_64 fw_mail: fw_mail_plug-3.0.0.3b4e481-1.x86_64 -tsg_conn_sketch: tsg_conn_sketch-2.0.v2.0_alpha.af621ca-1.x86_64 +tsg_conn_sketch: tsg_conn_sketch-2.0.5.63c1e51-1.x86_64 #################### #Tsg_app