diff options
| author | zhangzhihan <[email protected]> | 2020-06-24 18:08:40 +0800 |
|---|---|---|
| committer | zhangzhihan <[email protected]> | 2020-06-24 18:08:40 +0800 |
| commit | e6fbb265a82a3e8939cc54707358616579e0fcf4 (patch) | |
| tree | 359ec62ca898d411b6fc11d62e1d1bb27d2d8250 /roles/tfe | |
| parent | e1dc6b5f6221e32de7c323846de065f4bd852f2c (diff) | |
Diffstat (limited to 'roles/tfe')
| -rw-r--r-- | roles/tfe/templates/pangu_pxy.conf.j2 | 4 | ||||
| -rw-r--r-- | roles/tfe/templates/tfe-env-config.j2 | 4 | ||||
| -rw-r--r-- | roles/tfe/templates/tfe.conf.j2 | 6 |
3 files changed, 7 insertions, 7 deletions
diff --git a/roles/tfe/templates/pangu_pxy.conf.j2 b/roles/tfe/templates/pangu_pxy.conf.j2 index 1e442f9..8790677 100644 --- a/roles/tfe/templates/pangu_pxy.conf.j2 +++ b/roles/tfe/templates/pangu_pxy.conf.j2 @@ -2,8 +2,8 @@ log_level=30
[log]
-{% if tsg_running_type == 0 %}
-nic_name={{ tsg_tun_mode.ethname }}
+{% if tsg_running_type == 0 or 1 %}
+nic_name={{ server.ethname }}
{% else %}
nic_name={{ nic_mgr.name }}
{% endif %}
diff --git a/roles/tfe/templates/tfe-env-config.j2 b/roles/tfe/templates/tfe-env-config.j2 index 9712e35..172ef12 100644 --- a/roles/tfe/templates/tfe-env-config.j2 +++ b/roles/tfe/templates/tfe-env-config.j2 @@ -14,7 +14,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_running_type == 0 %} -TFE_WATCHDOG_DEVICE={{ tsg_tun_mode.tun_name }} +{% if tsg_running_type == 0 or 1 %} +TFE_WATCHDOG_DEVICE={{ server.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 a6bb455..02beb08 100644 --- a/roles/tfe/templates/tfe.conf.j2 +++ b/roles/tfe/templates/tfe.conf.j2 @@ -31,8 +31,8 @@ service_cache_expire_seconds=600 # default 0 mc_cache_enable=1 # default eth0 -{% if tsg_running_type == 0 %} -mc_cache_eth={{ tsg_tun_mode.tun_name }} +{% if tsg_running_type == 0 or 1 %} +mc_cache_eth={{ server.tun_name }} {% else %} mc_cache_eth={{ nic_inner_ctrl.name }} {% endif %} @@ -56,7 +56,7 @@ enable_health_check=0 passthrough_all_tcp=0 [traffic_mirror] -{% if tsg_running_type == 0 %} +{% if tsg_running_type == 0 or 1 %} device=lo {% else %} device={{ nic_traffic_mirror.name }} |