20200521

2020-05-21 15:30:04 +08:00
parent 037489a9b4
commit 17221ed921
3 changed files with 4 additions and 12 deletions
--- a/roles/mrzcpd/tasks/main.yml
+++ b/roles/mrzcpd/tasks/main.yml
@@ -26,7 +26,6 @@
    src: "{{ role_path }}/templates/mrglobal.conf.tun_mode.j2"
    dest: /opt/mrzcpd/etc/mrglobal.conf
  when: 
-    - nic_traffic_mirror is not defined
    - tsg_access_type == 0

 - name: "update mrglobal.conf.inline - blade00"
--- a/roles/tfe/templates/tfe.conf.j2
+++ b/roles/tfe/templates/tfe.conf.j2
@@ -55,7 +55,11 @@ untrusted_ca_path=resource/tfe/tango-ca-v3-untrust-ca.pem
 passthrough_all_tcp=0

 [traffic_mirror]
+{% if tsg_access_type == 0 %}
+device=lo
+{% else %}
 device={{ nic_traffic_mirror.name }}
+{% endif %}
 type=0

 [ratelimit]