功能端部署剧本升级，适配20.04版本

roles/tfe/tasks/main.yml

@@ -7,18 +7,9 @@
 - name: "install tfe rpms from localhost"
   yum:
     name:
-      - /tmp/ansible_deploy/tfe-kmod-v1.0.4.20190923-1dkms.noarch.rpm
-      - /tmp/ansible_deploy/tfe-4.3.0.202001081429550800.92060ee-1.el7.x86_64.rpm
+      - /tmp/ansible_deploy/tfe-kmod-v1.0.5.20200408-1dkms.noarch.rpm
+      - /tmp/ansible_deploy/tfe-4.3.1.cc89b5b-1.el7.x86_64.rpm
     state: present
-  when: package_source == "local"
-
-- name: "install tfe rpms from pulp"
-  yum:
-    name:
-      - /tmp/ansible_deploy/tfe-kmod-v1.0.4.20190923-1dkms.noarch.rpm
-      - tfe
-    state: latest
-  when: package_source == "pulp"
 
 - name: "template tfe-env config"
   template:
@@ -56,14 +47,6 @@
     name: tfe-env
     enabled: yes
     daemon_reload: yes
-  when: not run_as_tun_mode
-
-- name: "enable tfe-env-tun"
-  systemd:
-    name: tfe-env-tun-mode
-    enabled: yes
-    daemon_reload: yes
-  when: run_as_tun_mode
 
 - name: "enable tfe"
   systemd:

roles/tfe/templates/tfe-env-config.j2

@@ -5,7 +5,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 run_as_tun_mode %}
+{% if tsg_access_type == 0 %}
 TFE_WATCHDOG_DEVICE={{ nic_inner_ctrl.name }}
 TFE_WATCHDOG_IP=192.168.100.1
 {% endif %}