20200521

install_config/group_vars/all.yml

@@ -68,17 +68,6 @@ mrtunnat:
   lcore_id: 38
 
 ########################################
-nic_mgr:
-  name: eth0
-nic_data_incoming:
-  name: tun_kni
-  address: 127.0.0.1
-nic_inner_ctrl:
-  name: eth0.100
-nic_traffic_mirror:
-  name: lo
-  use_mrzcpd: 0
-
 tsg_tun_mode:
   ethname: eth0
   tun_name: eth0.100

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"

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]