diff options
| author | zhangzhihan <[email protected]> | 2020-04-26 02:06:47 +0800 |
|---|---|---|
| committer | zhangzhihan <[email protected]> | 2020-04-26 02:06:47 +0800 |
| commit | 633624c5a5b33fb4ab02944315bcc50f14afca55 (patch) | |
| tree | 4082a6e6f64d31cacbe80a72411acd58fcb6abf5 /roles/tfe | |
| parent | 9cad585759660080e0280c543c4abb65377e76de (diff) | |
功能端部署剧本升级，适配20.04版本
Diffstat (limited to 'roles/tfe')
| -rw-r--r-- | roles/tfe/files/tfe-4.3.0.202001081429550800.92060ee-1.el7.x86_64.rpm | bin | 3881928 -> 0 bytes | |||
| -rw-r--r-- | roles/tfe/files/tfe-kmod-v1.0.4.20190923-1dkms.noarch.rpm | bin | 18264 -> 0 bytes | |||
| -rw-r--r-- | roles/tfe/tasks/main.yml | 21 | ||||
| -rw-r--r-- | roles/tfe/templates/tfe-env-config.j2 | 2 |
4 files changed, 3 insertions, 20 deletions
diff --git a/roles/tfe/files/tfe-4.3.0.202001081429550800.92060ee-1.el7.x86_64.rpm b/roles/tfe/files/tfe-4.3.0.202001081429550800.92060ee-1.el7.x86_64.rpm Binary files differdeleted file mode 100644 index e91b3c0..0000000 --- a/roles/tfe/files/tfe-4.3.0.202001081429550800.92060ee-1.el7.x86_64.rpm +++ /dev/null diff --git a/roles/tfe/files/tfe-kmod-v1.0.4.20190923-1dkms.noarch.rpm b/roles/tfe/files/tfe-kmod-v1.0.4.20190923-1dkms.noarch.rpm Binary files differdeleted file mode 100644 index da6096a..0000000 --- a/roles/tfe/files/tfe-kmod-v1.0.4.20190923-1dkms.noarch.rpm +++ /dev/null diff --git a/roles/tfe/tasks/main.yml b/roles/tfe/tasks/main.yml index 79aa928..5d3b9a3 100644 --- a/roles/tfe/tasks/main.yml +++ b/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: diff --git a/roles/tfe/templates/tfe-env-config.j2 b/roles/tfe/templates/tfe-env-config.j2 index e00dff2..2874c27 100644 --- a/roles/tfe/templates/tfe-env-config.j2 +++ b/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 %} |