summaryrefslogtreecommitdiff
path: root/roles/sapp
diff options
context:
space:
mode:
authorfumingwei <[email protected]>2021-02-08 11:28:33 +0800
committerfumingwei <[email protected]>2021-02-08 11:28:33 +0800
commitad3dcedcb16fdf91538f56a12c121fd681f0f324 (patch)
treef6a39ef7144e0fff0a243a99ccbdb09021ca56c6 /roles/sapp
parent64680a508799aa0f91474ebfa489f4897f0d3ded (diff)
1、修改platform配置文件,删除proxy_topo_type 配置项,增加注释
2、更新v21.02内容 3、修改host文件,更新platform内容
Diffstat (limited to 'roles/sapp')
-rw-r--r--roles/sapp/files/sapp-4.2.25.893d15d-2.el7.x86_64.rpmbin463644 -> 0 bytes
-rw-r--r--roles/sapp/files/sapp-4.2.26.fc1a6aa-2.el7.x86_64.rpmbin0 -> 463976 bytes
-rw-r--r--roles/sapp/tasks/main.yml2
-rw-r--r--roles/sapp/templates/sapp.service.j22
4 files changed, 2 insertions, 2 deletions
diff --git a/roles/sapp/files/sapp-4.2.25.893d15d-2.el7.x86_64.rpm b/roles/sapp/files/sapp-4.2.25.893d15d-2.el7.x86_64.rpm
deleted file mode 100644
index ca045ab..0000000
--- a/roles/sapp/files/sapp-4.2.25.893d15d-2.el7.x86_64.rpm
+++ /dev/null
Binary files differ
diff --git a/roles/sapp/files/sapp-4.2.26.fc1a6aa-2.el7.x86_64.rpm b/roles/sapp/files/sapp-4.2.26.fc1a6aa-2.el7.x86_64.rpm
new file mode 100644
index 0000000..5d6b2ac
--- /dev/null
+++ b/roles/sapp/files/sapp-4.2.26.fc1a6aa-2.el7.x86_64.rpm
Binary files differ
diff --git a/roles/sapp/tasks/main.yml b/roles/sapp/tasks/main.yml
index ac15ac3..a8a3acf 100644
--- a/roles/sapp/tasks/main.yml
+++ b/roles/sapp/tasks/main.yml
@@ -13,7 +13,7 @@
- name: "install sapp rpms from localhost"
yum:
name:
- - /tmp/ansible_deploy/sapp-4.2.25.893d15d-2.el7.x86_64.rpm
+ - /tmp/ansible_deploy/sapp-4.2.26.fc1a6aa-2.el7.x86_64.rpm
state: present
- name: "install tcpdump_mesa rpms from localhost"
diff --git a/roles/sapp/templates/sapp.service.j2 b/roles/sapp/templates/sapp.service.j2
index f463dc4..8c04042 100644
--- a/roles/sapp/templates/sapp.service.j2
+++ b/roles/sapp/templates/sapp.service.j2
@@ -1,6 +1,6 @@
[Unit]
Description=sapp service
-{% if proxy_topo_type != 0 %}
+{% if capture_packet_type == 1 %}
Requires=mrzcpd.service
After=mrzcpd.service
{% endif %}