增加TUN与双臂模式的部署支持

2019-09-26 16:10:41 +08:00
parent f123e488f8
commit 0885700e69
11 changed files with 190 additions and 51 deletions
--- a/roles/tfe/templates/tfe-env-config.j2
+++ b/roles/tfe/templates/tfe-env-config.j2
@@ -3,4 +3,9 @@ TFE_DEVICE_DATA_INCOMING={{nic_data_incoming.name}}
 TFE_LOCAL_MAC_DATA_INCOMING=fe:65:b7:03:50:bd
 TFE_PEER_MAC_DATA_INCOMING=aa:bb:cc:dd:ee:ff
 TFE_LOCAL_IP_DATA_INCOMING=172.16.241.2
-TFE_PEER_IP_DATA_INCOMING=172.16.241.1
+TFE_PEER_IP_DATA_INCOMING=172.16.241.1
+
+{% if run_as_tun_mode %}
+TFE_WATCHDOG_DEVICE=lo
+TFE_WATCHDOG_IP=127.0.0.1
+{% endif %}
--- a/roles/tfe/templates/tfe.conf.j2
+++ b/roles/tfe/templates/tfe.conf.j2
@@ -37,7 +37,7 @@ passthrough_all_tcp=0

 [traffic_mirror]
 device= {{ nic_traffic_mirror.name }}
-type = 1
+type = {{ nic_traffic_mirror.use_mrzcpd }}

 [ratelimit]
 #read_rate=200000