fix ulimit settings

lvcyong · Sep 2, 2018 · 3f85b6d · 3f85b6d
1 parent 9e41498
commit 3f85b6d
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 15 deletions.
diff --git a/roles/prepare/tasks/centos.yml b/roles/prepare/tasks/centos.yml
@@ -31,13 +31,4 @@
     line: "SELINUX=disabled"
 
 - name: 设置 Centos ulimits
-  lineinfile:
-    dest: /etc/security/limits.conf
-    regexp: "{{ item }}"
-    line: "{{ item }} 65535"
-  with_items:
-    - "* soft nofile"
-    - "* hard nofile"
-    - "* soft nproc"
-    - "* hard nproc"
-
+  template: src=30-kubeasz.conf.j2 dest=/etc/security/limits.d/30-kubeasz.conf
diff --git a/roles/prepare/tasks/common.yml b/roles/prepare/tasks/common.yml
@@ -13,7 +13,11 @@
 # 设置系统参数for k8s
 # 消除docker info 警告WARNING: bridge-nf-call-ip[6]tables is disabled
 - name: 设置系统参数
-  copy: src=95-k8s-sysctl.conf dest=/etc/sysctl.d/95-k8s-sysctl.conf
+  template: src=95-k8s-sysctl.conf.j2 dest=/etc/sysctl.d/95-k8s-sysctl.conf
+
+- name: 生效系统参数
+  shell: "sysctl -p /etc/sysctl.d/95-k8s-sysctl.conf"
+  ignore_errors: true
 
 - name: 加载内核模块
   modprobe: name={{ item }} state=present
@@ -26,7 +30,3 @@
     - nf_conntrack_ipv4
   ignore_errors: true
 
-- name: 生效系统参数
-  shell: "sysctl -p /etc/sysctl.d/95-k8s-sysctl.conf"
-  ignore_errors: true
-
diff --git a/roles/prepare/tasks/debian.yml b/roles/prepare/tasks/debian.yml
@@ -27,3 +27,5 @@
     regexp: "ulimit -SHn"
     line: "ulimit -SHn 65535"
 
+- name: 设置 ulimits2
+  template: src=30-kubeasz.conf.j2 dest=/etc/security/limits.d/30-kubeasz.conf
diff --git a/roles/prepare/templates/30-kubeasz.conf.j2 b/roles/prepare/templates/30-kubeasz.conf.j2
@@ -0,0 +1,4 @@
+* soft nofile 65535
+* hard nofile 65535
+* soft nproc 65535
+* hard nproc 65535
diff --git a/roles/prepare/files/95-k8s-sysctl.conf → ...s/prepare/templates/95-k8s-sysctl.conf.j2 b/roles/prepare/files/95-k8s-sysctl.conf → ...s/prepare/templates/95-k8s-sysctl.conf.j2