diff options
| author | zhangzhihan <[email protected]> | 2020-05-21 15:30:04 +0800 |
|---|---|---|
| committer | zhangzhihan <[email protected]> | 2020-05-21 15:30:04 +0800 |
| commit | 17221ed92130a9d60fe879f05450ec5fc573b2f3 (patch) | |
| tree | 3e534718ab3eef24605d115c837fce4f68418812 | |
| parent | 037489a9b43f5aee28a607ccf0a07f9b8f34777b (diff) | |
20200521
| -rw-r--r-- | install_config/group_vars/all.yml | 11 | ||||
| -rw-r--r-- | roles/mrzcpd/tasks/main.yml | 1 | ||||
| -rw-r--r-- | roles/tfe/templates/tfe.conf.j2 | 4 |
3 files changed, 4 insertions, 12 deletions
diff --git a/install_config/group_vars/all.yml b/install_config/group_vars/all.yml index b3ab94a..728f292 100644 --- a/install_config/group_vars/all.yml +++ b/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 diff --git a/roles/mrzcpd/tasks/main.yml b/roles/mrzcpd/tasks/main.yml index 4b6e626..68bf3cc 100644 --- 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" diff --git a/roles/tfe/templates/tfe.conf.j2 b/roles/tfe/templates/tfe.conf.j2 index 62d2fd4..b009909 100644 --- 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] |