1.delete mrzcpd memory.conf

2.modify tfe and sapp service timeout
2020-11-17 09:12:48 +06:00
parent d8ddd2afb5
commit c08515afbb
4 changed files with 2 additions and 10 deletions
--- a/roles/mrzcpd/files/memory.conf
+++ b/roles/mrzcpd/files/memory.conf
@@ -1,2 +0,0 @@
-[Service]
-MemoryMax=100G
--- a/roles/mrzcpd/tasks/main.yml
+++ b/roles/mrzcpd/tasks/main.yml
@@ -173,12 +173,6 @@
    daemon_reload: yes
  when: nic_traffic_mirror is defined

- name: "copy memory limit file to tfe.service.d"
-  copy:
-    src: "{{ role_path }}/files/memory.conf"
-    dest: /etc/systemd/system/mrzcpd.service.d/
-    mode: 0644
-
 - name: "mask mrzcpd on server_tun_mode"
  systemd:
    name: mrzcpd
--- a/roles/sapp/templates/sapp.service.j2
+++ b/roles/sapp/templates/sapp.service.j2
@@ -8,7 +8,7 @@ After=mrzcpd.service
 Type=notify
 WorkingDirectory=/home/mesasoft/sapp_run
 ExecStart=/home/mesasoft/sapp_run/sapp
-TimeoutSec=300s
+TimeoutSec=900s
 RestartSec=10s
 Restart=always
 LimitNOFILE=524288
--- a/roles/tfe/files/tfe.service
+++ b/roles/tfe/files/tfe.service
@@ -8,7 +8,7 @@ After=tfe-env.service
 Type=notify
 ExecStart=/opt/tsg/tfe/bin/tfe
 WorkingDirectory=/opt/tsg/tfe/
-TimeoutSec=7200s
+TimeoutSec=900s
 RestartSec=10s
 Restart=always
 LimitNOFILE=524288