Merge branch 'tsg-version20.11.rc1-deploy-firewall' into tsg-version20.11.rc1-deploy

# Conflicts:
#	roles/sapp/tasks/main.yml

更新firewall相关RPM包

roles/sapp/tasks/main.yml

@@ -13,7 +13,7 @@
 - name: "install sapp rpms from localhost"
   yum:
     name:
-      - /tmp/ansible_deploy/sapp-4.1.12.b8f6ea4-2.el7.x86_64.rpm
+      - /tmp/ansible_deploy/sapp-4.1.13.ed89137-2.el7.x86_64.rpm
     state: present
     skip_broken: yes
 
@@ -51,13 +51,7 @@
   template:
     src: "{{ role_path }}/templates/sapp.service.j2"
     dest: /usr/lib/systemd/system/sapp.service
-    mode: 0644
-
-- name: "copy memory limit file to sapp.service.d"
-  copy:
-    src: "{{ role_path }}/files/memory.conf"
-    dest: /etc/systemd/system/sapp.service.d/
-    mode: 0644
+    mode: 0755
 
 - name: "enable sapp"
   systemd: