diff options
| author | zhangzhihan <[email protected]> | 2020-04-29 14:59:53 +0800 |
|---|---|---|
| committer | zhangzhihan <[email protected]> | 2020-04-29 14:59:53 +0800 |
| commit | 6dc5a5113dba5e7bebe78a80c4186caa316b8d48 (patch) | |
| tree | 929d9e9ac6dd671fc0f37e36c388494a9fa21e36 | |
| parent | 8dd9d58e0794a822779f143eb3a35abf5c961812 (diff) | |
sapp更新4.0.8tsg-version20.4-deploy
| -rw-r--r-- | roles/mrzcpd/files/mrzcpd-4.3.17.f543325-1.el7.x86_64.rpm | bin | 33279784 -> 0 bytes | |||
| -rw-r--r-- | roles/mrzcpd/tasks/main.yml | 2 | ||||
| -rw-r--r-- | roles/sapp/tasks/main.yml | 2 | ||||
| -rw-r--r-- | roles/sapp/templates/conflist.inf.j2 | 5 |
4 files changed, 7 insertions, 2 deletions
diff --git a/roles/mrzcpd/files/mrzcpd-4.3.17.f543325-1.el7.x86_64.rpm b/roles/mrzcpd/files/mrzcpd-4.3.17.f543325-1.el7.x86_64.rpm Binary files differdeleted file mode 100644 index caa34c1..0000000 --- a/roles/mrzcpd/files/mrzcpd-4.3.17.f543325-1.el7.x86_64.rpm +++ /dev/null diff --git a/roles/mrzcpd/tasks/main.yml b/roles/mrzcpd/tasks/main.yml index 77cbf44..6fb1448 100644 --- a/roles/mrzcpd/tasks/main.yml +++ b/roles/mrzcpd/tasks/main.yml @@ -6,7 +6,7 @@ - name: "install mrzcpd" yum: - name: /tmp/ansible_deploy/mrzcpd-4.3.17.f543325-1.el7.x86_64.rpm + name: /tmp/ansible_deploy/mrzcpd-4.3.18.f543325-1.el7.x86_64.rpm state: present - name: "update sysconfig/mrzcpd" diff --git a/roles/sapp/tasks/main.yml b/roles/sapp/tasks/main.yml index 3bfba39..a0654df 100644 --- a/roles/sapp/tasks/main.yml +++ b/roles/sapp/tasks/main.yml @@ -17,7 +17,7 @@ ignore_errors: true - name: "install sapp rpms from localhost" - shell: cd /tmp/ansible_deploy;rpm -ivh sapp-4.0.11.347f7b7-x86_64.rpm --nodeps + shell: cd /tmp/ansible_deploy;rpm -ivh sapp-4.0.8.fb5bce9-1.el7.x86_64.rpm when: return.rc != 0 - name: make dir diff --git a/roles/sapp/templates/conflist.inf.j2 b/roles/sapp/templates/conflist.inf.j2 index 7c17291..d76d7dc 100644 --- a/roles/sapp/templates/conflist.inf.j2 +++ b/roles/sapp/templates/conflist.inf.j2 @@ -1,8 +1,13 @@ [platform] {% if tsg_access_type == 1 %} ./plug/platform/g_device_plug/g_device_plug.inf +#./plug/platform/http_healthcheck/http_healthcheck.inf +{% elif tsg_access_type == 2 %} +#./plug/platform/g_device_plug/g_device_plug.inf +./plug/platform/http_healthcheck/http_healthcheck.inf {% else %} #./plug/platform/g_device_plug/g_device_plug.inf +#./plug/platform/http_healthcheck/http_healthcheck.inf {% endif %} ./plug/platform/tsg_master/tsg_master.inf |