diff options
| author | zhangzhihan <[email protected]> | 2020-06-09 13:10:38 +0800 |
|---|---|---|
| committer | zhangzhihan <[email protected]> | 2020-06-09 13:10:38 +0800 |
| commit | 829dd78560768c693bddca2519f1d637eef87748 (patch) | |
| tree | a71e628aa1440e35a3180a83d84ee23e45465987 /roles/tfe | |
| parent | 792ce3da1a3bc571ea318af6c76ad5111740864c (diff) | |
update
Diffstat (limited to 'roles/tfe')
| -rw-r--r-- | roles/tfe/templates/pangu_pxy.conf.j2 | 2 | ||||
| -rw-r--r-- | roles/tfe/templates/tfe-env-config.j2 | 4 | ||||
| -rw-r--r-- | roles/tfe/templates/tfe.conf.j2 | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/roles/tfe/templates/pangu_pxy.conf.j2 b/roles/tfe/templates/pangu_pxy.conf.j2 index eb279b2..1e442f9 100644 --- a/roles/tfe/templates/pangu_pxy.conf.j2 +++ b/roles/tfe/templates/pangu_pxy.conf.j2 @@ -2,7 +2,7 @@ log_level=30
[log]
-{% if tsg_access_type == 0 %}
+{% if tsg_running_type == 0 %}
nic_name={{ tsg_tun_mode.ethname }}
{% else %}
nic_name={{ nic_mgr.name }}
diff --git a/roles/tfe/templates/tfe-env-config.j2 b/roles/tfe/templates/tfe-env-config.j2 index 700742b..4c163f6 100644 --- a/roles/tfe/templates/tfe-env-config.j2 +++ b/roles/tfe/templates/tfe-env-config.j2 @@ -1,4 +1,4 @@ -{% if tsg_access_type == 0 %} +{% if tsg_running_type == 0 %} TFE_DEVICE_DATA_INCOMING=tun_kni {% else %} TFE_DEVICE_DATA_INCOMING={{ nic_data_incoming.name }} @@ -8,7 +8,7 @@ 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 -{% if tsg_access_type == 0 %} +{% if tsg_running_type == 0 %} TFE_WATCHDOG_DEVICE={{ tsg_tun_mode.tun_name }} TFE_WATCHDOG_IP=192.168.100.1 {% endif %} diff --git a/roles/tfe/templates/tfe.conf.j2 b/roles/tfe/templates/tfe.conf.j2 index 5dfe34d..a6bb455 100644 --- a/roles/tfe/templates/tfe.conf.j2 +++ b/roles/tfe/templates/tfe.conf.j2 @@ -31,7 +31,7 @@ service_cache_expire_seconds=600 # default 0 mc_cache_enable=1 # default eth0 -{% if tsg_access_type == 0 %} +{% if tsg_running_type == 0 %} mc_cache_eth={{ tsg_tun_mode.tun_name }} {% else %} mc_cache_eth={{ nic_inner_ctrl.name }} @@ -56,7 +56,7 @@ enable_health_check=0 passthrough_all_tcp=0 [traffic_mirror] -{% if tsg_access_type == 0 %} +{% if tsg_running_type == 0 %} device=lo {% else %} device={{ nic_traffic_mirror.name }} |