max open files #2

kelvich · kelvich · commit 72e2fc38ef90 · 2015-11-11T21:14:19.000+03:00
diff --git a/tests/deploy/cluster.yml b/tests/deploy/cluster.yml
@@ -46,13 +46,16 @@
     environment:
       LD_LIBRARY_PATH: "{{pg_dst}}/lib/"
 
-
 - hosts: clients
   tasks:
-  - name: increase open files
-    shell: "echo '{{ansible_ssh_user}}  soft  nofile  65535' > /etc/security/limits.d/cluster.conf"
-    args:
-      creates: "/etc/security/limits.d/cluster.conf"
+  - name: increase max open files
+    lineinfile:
+      dest: /etc/security/limits.d/cluster.conf
+      line: "{{item}}"
+      state: present
+    with_items:
+    - '{{ansible_ssh_user}}  soft  nofile  65535'
+    - '{{ansible_ssh_user}}  hard  nofile  65535'
     sudo: yes
 
   - name: copy pg source
diff --git a/tests/deploy/roles/postgres/tasks/main.yml b/tests/deploy/roles/postgres/tasks/main.yml
@@ -10,7 +10,7 @@
   - bison
   - flex
   - libreadline-dev
-  when: ansible_os_family == "Debian"
+  when: (pg_copydist is undefined) and ansible_os_family == "Debian"
   sudo: yes
 
 - name: ensure dependencies (RedHat)
@@ -34,10 +34,14 @@
   shell: sysctl kernel.sem='1000 128000 128 512'
   sudo: yes
 
-- name: increase open files
-  shell: "echo '{{ansible_ssh_user}}  soft  nofile  65535' > /etc/security/limits.d/cluster.conf"
-  args:
-    creates: "/etc/security/limits.d/cluster.conf"
+- name: increase max open files
+  lineinfile:
+    dest: /etc/security/limits.d/cluster.conf
+    line: "{{item}}"
+    state: present
+  with_items:
+  - '{{ansible_ssh_user}}  soft  nofile  65535'
+  - '{{ansible_ssh_user}}  hard  nofile  65535'
   sudo: yes
 
 #############################################################################
