remove kernel.pid_max

This is now managed by Ceph packages.

See: https://github.com/ceph/ceph/pull/18544/files

http://tracker.ceph.com/issues/21929

Closes: https://github.com/ceph/ceph-ansible/issues/2410
Signed-off-by: Sébastien Han <seb@redhat.com>

diff --git a/group_vars/all.yml.sample b/group_vars/all.yml.sample
index e1c4035e74917f39cfe929113180e866ca6a3be3..1d98c69c8f249d3e06296aeb0e6113671e08620a 100644 (file)
--- a/group_vars/all.yml.sample
+++ b/group_vars/all.yml.sample
@@ -476,7 +476,6 @@ dummy:
 
 #disable_transparent_hugepage: true
 #os_tuning_params:
-#  - { name: kernel.pid_max, value: 4194303 }
 #  - { name: fs.file-max, value: 26234859 }
 #  - { name: vm.zone_reclaim_mode, value: 0 }
 #  - { name: vm.swappiness, value: 10 }

diff --git a/group_vars/rhcs.yml.sample b/group_vars/rhcs.yml.sample
index b18a9f76599d2d9620b7e3f043cf6655b148f0bd..7d0acfa66d3f846150ef03c73cd1e139c39264b4 100644 (file)
--- a/group_vars/rhcs.yml.sample
+++ b/group_vars/rhcs.yml.sample
@@ -476,7 +476,6 @@ ceph_repository: rhcs
 
 #disable_transparent_hugepage: true
 #os_tuning_params:
-#  - { name: kernel.pid_max, value: 4194303 }
 #  - { name: fs.file-max, value: 26234859 }
 #  - { name: vm.zone_reclaim_mode, value: 0 }
 #  - { name: vm.swappiness, value: 10 }

diff --git a/roles/ceph-defaults/defaults/main.yml b/roles/ceph-defaults/defaults/main.yml
index 1368189ed3aebc76023a8358516e1281243eebf0..60c235be2333bf34da27c43b7d203d53f99662ad 100644 (file)
--- a/roles/ceph-defaults/defaults/main.yml
+++ b/roles/ceph-defaults/defaults/main.yml
@@ -468,7 +468,6 @@ ceph_conf_overrides: {}
 
 disable_transparent_hugepage: true
 os_tuning_params:
-  - { name: kernel.pid_max, value: 4194303 }
   - { name: fs.file-max, value: 26234859 }
   - { name: vm.zone_reclaim_mode, value: 0 }
   - { name: vm.swappiness, value: 10 }

diff --git a/tests/functional/centos/7/bs-lvm-osds/group_vars/all b/tests/functional/centos/7/bs-lvm-osds/group_vars/all
index b06be9b707be80d00d9236b3b25d132bce3f78fa..f30393671fe5ae8b8dc1b0720e473c1773f807eb 100644 (file)
--- a/tests/functional/centos/7/bs-lvm-osds/group_vars/all
+++ b/tests/functional/centos/7/bs-lvm-osds/group_vars/all
@@ -18,7 +18,6 @@ lvm_volumes:
     db: journal1
     db_vg: journals
 os_tuning_params:
-  - { name: kernel.pid_max, value: 4194303 }
   - { name: fs.file-max, value: 26234859 }
 ceph_conf_overrides:
   global:

diff --git a/tests/functional/centos/7/bs-lvm-osds/vagrant_variables.yml b/tests/functional/centos/7/bs-lvm-osds/vagrant_variables.yml
index a23491cbb9e0b34aaca0f8b6139196666591d5bd..342ce5f9ca5393d58822543770a161eb166d50b0 100644 (file)
--- a/tests/functional/centos/7/bs-lvm-osds/vagrant_variables.yml
+++ b/tests/functional/centos/7/bs-lvm-osds/vagrant_variables.yml
@@ -70,5 +70,4 @@ vagrant_disable_synced_folder: true
 # vagrant_box_url: https://download.fedoraproject.org/pub/fedora/linux/releases/22/Cloud/x86_64/Images/Fedora-Cloud-Base-Vagrant-22-20150521.x86_64.vagrant-virtualbox.box
 
 os_tuning_params:
-  - { name: kernel.pid_max, value: 4194303 }
   - { name: fs.file-max, value: 26234859 }

diff --git a/tests/functional/centos/7/bs-osds-container/group_vars/osds.yml b/tests/functional/centos/7/bs-osds-container/group_vars/osds.yml
index ed9b23ad137ba22e8eb3deb381ac3e1817924e2a..77f10f0aaaec00f154dab497885a931c0093415c 100644 (file)
--- a/tests/functional/centos/7/bs-osds-container/group_vars/osds.yml
+++ b/tests/functional/centos/7/bs-osds-container/group_vars/osds.yml
@@ -1,4 +1,3 @@
 ---
 os_tuning_params:
-  - { name: kernel.pid_max, value: 4194303 }
   - { name: fs.file-max, value: 26234859 }

diff --git a/tests/functional/centos/7/bs-osds-container/vagrant_variables.yml b/tests/functional/centos/7/bs-osds-container/vagrant_variables.yml
index ce7f8b697b9551347df17ad81cca2a2e99ea4dbb..8f3b0234b2bcf4ef9dd805bf77749c6339cdd186 100644 (file)
--- a/tests/functional/centos/7/bs-osds-container/vagrant_variables.yml
+++ b/tests/functional/centos/7/bs-osds-container/vagrant_variables.yml
@@ -70,5 +70,4 @@ vagrant_disable_synced_folder: true
 # vagrant_box_url: https://download.fedoraproject.org/pub/fedora/linux/releases/22/Cloud/x86_64/Images/Fedora-Cloud-Base-Vagrant-22-20150521.x86_64.vagrant-virtualbox.box
 
 os_tuning_params:
-  - { name: kernel.pid_max, value: 4194303 }
   - { name: fs.file-max, value: 26234859 }

diff --git a/tests/functional/centos/7/bs-osds-non-container/group_vars/osds.yml b/tests/functional/centos/7/bs-osds-non-container/group_vars/osds.yml
index ed9b23ad137ba22e8eb3deb381ac3e1817924e2a..77f10f0aaaec00f154dab497885a931c0093415c 100644 (file)
--- a/tests/functional/centos/7/bs-osds-non-container/group_vars/osds.yml
+++ b/tests/functional/centos/7/bs-osds-non-container/group_vars/osds.yml
@@ -1,4 +1,3 @@
 ---
 os_tuning_params:
-  - { name: kernel.pid_max, value: 4194303 }
   - { name: fs.file-max, value: 26234859 }

diff --git a/tests/functional/centos/7/bs-osds-non-container/vagrant_variables.yml b/tests/functional/centos/7/bs-osds-non-container/vagrant_variables.yml
index a35d2652a20b483838732cb5ad6b13f58500b5ca..6495484035f822e57a608dabd6c7d16c99b27417 100644 (file)
--- a/tests/functional/centos/7/bs-osds-non-container/vagrant_variables.yml
+++ b/tests/functional/centos/7/bs-osds-non-container/vagrant_variables.yml
@@ -70,5 +70,4 @@ vagrant_disable_synced_folder: true
 # vagrant_box_url: https://download.fedoraproject.org/pub/fedora/linux/releases/22/Cloud/x86_64/Images/Fedora-Cloud-Base-Vagrant-22-20150521.x86_64.vagrant-virtualbox.box
 
 os_tuning_params:
-  - { name: kernel.pid_max, value: 4194303 }
   - { name: fs.file-max, value: 26234859 }

diff --git a/tests/functional/centos/7/cluster/group_vars/all b/tests/functional/centos/7/cluster/group_vars/all
index 8cb59549561912350fae0a9768d708e0e75f6d7f..0bfe7f3cc97b21c6318bd1a7768cae2da659e77b 100644 (file)
--- a/tests/functional/centos/7/cluster/group_vars/all
+++ b/tests/functional/centos/7/cluster/group_vars/all
@@ -16,7 +16,6 @@ dedicated_devices:
   - '/dev/sdc'
 osd_scenario: non-collocated
 os_tuning_params:
-  - { name: kernel.pid_max, value: 4194303 }
   - { name: fs.file-max, value: 26234859 }
 user_config: True
 openstack_config: True

diff --git a/tests/functional/centos/7/cluster/group_vars/osds b/tests/functional/centos/7/cluster/group_vars/osds
index 34c4fa0c2d593e6d16dc3c4bdf4fec20d7ff9728..aa159bba8be0c45f96fa7168cd19f04f5297c77d 100644 (file)
--- a/tests/functional/centos/7/cluster/group_vars/osds
+++ b/tests/functional/centos/7/cluster/group_vars/osds
@@ -1,5 +1,4 @@
 ---
 copy_admin_key: true
 os_tuning_params:
-  - { name: kernel.pid_max, value: 4194303 }
   - { name: fs.file-max, value: 26234859 }

diff --git a/tests/functional/centos/7/cluster/vagrant_variables.yml b/tests/functional/centos/7/cluster/vagrant_variables.yml
index 4a73aec712b211cfd1669ddbd18da5168e68c791..022dfaedf6816667bcd6037367755752fc6f5d7d 100644 (file)
--- a/tests/functional/centos/7/cluster/vagrant_variables.yml
+++ b/tests/functional/centos/7/cluster/vagrant_variables.yml
@@ -70,7 +70,6 @@ vagrant_disable_synced_folder: true
 # vagrant_box_url: https://download.fedoraproject.org/pub/fedora/linux/releases/22/Cloud/x86_64/Images/Fedora-Cloud-Base-Vagrant-22-20150521.x86_64.vagrant-virtualbox.box
 
 os_tuning_params:
-  - { name: kernel.pid_max, value: 4194303 }
   - { name: fs.file-max, value: 26234859 }
 
 # VM prefix name, need to match the hostname

diff --git a/tests/functional/centos/7/fs-osds-container/group_vars/osds.yml b/tests/functional/centos/7/fs-osds-container/group_vars/osds.yml
index ed9b23ad137ba22e8eb3deb381ac3e1817924e2a..77f10f0aaaec00f154dab497885a931c0093415c 100644 (file)
--- a/tests/functional/centos/7/fs-osds-container/group_vars/osds.yml
+++ b/tests/functional/centos/7/fs-osds-container/group_vars/osds.yml
@@ -1,4 +1,3 @@
 ---
 os_tuning_params:
-  - { name: kernel.pid_max, value: 4194303 }
   - { name: fs.file-max, value: 26234859 }

diff --git a/tests/functional/centos/7/fs-osds-container/vagrant_variables.yml b/tests/functional/centos/7/fs-osds-container/vagrant_variables.yml
index 985aaa2a968c198b74da2f196cd61916c648ab25..22116c01c6d3661cd6a47d937825a39b496a968e 100644 (file)
--- a/tests/functional/centos/7/fs-osds-container/vagrant_variables.yml
+++ b/tests/functional/centos/7/fs-osds-container/vagrant_variables.yml
@@ -70,5 +70,4 @@ vagrant_disable_synced_folder: true
 # vagrant_box_url: https://download.fedoraproject.org/pub/fedora/linux/releases/22/Cloud/x86_64/Images/Fedora-Cloud-Base-Vagrant-22-20150521.x86_64.vagrant-virtualbox.box
 
 os_tuning_params:
-  - { name: kernel.pid_max, value: 4194303 }
   - { name: fs.file-max, value: 26234859 }

diff --git a/tests/functional/centos/7/fs-osds-non-container/group_vars/osds.yml b/tests/functional/centos/7/fs-osds-non-container/group_vars/osds.yml
index ed9b23ad137ba22e8eb3deb381ac3e1817924e2a..77f10f0aaaec00f154dab497885a931c0093415c 100644 (file)
--- a/tests/functional/centos/7/fs-osds-non-container/group_vars/osds.yml
+++ b/tests/functional/centos/7/fs-osds-non-container/group_vars/osds.yml
@@ -1,4 +1,3 @@
 ---
 os_tuning_params:
-  - { name: kernel.pid_max, value: 4194303 }
   - { name: fs.file-max, value: 26234859 }

diff --git a/tests/functional/centos/7/fs-osds-non-container/vagrant_variables.yml b/tests/functional/centos/7/fs-osds-non-container/vagrant_variables.yml
index 60f945c283114b0f9b4f5caaebb39ba6413dca2d..39d7f4f6c256f3530914ed5840a7cdd16d0b6d12 100644 (file)
--- a/tests/functional/centos/7/fs-osds-non-container/vagrant_variables.yml
+++ b/tests/functional/centos/7/fs-osds-non-container/vagrant_variables.yml
@@ -70,5 +70,4 @@ vagrant_disable_synced_folder: true
 # vagrant_box_url: https://download.fedoraproject.org/pub/fedora/linux/releases/22/Cloud/x86_64/Images/Fedora-Cloud-Base-Vagrant-22-20150521.x86_64.vagrant-virtualbox.box
 
 os_tuning_params:
-  - { name: kernel.pid_max, value: 4194303 }
   - { name: fs.file-max, value: 26234859 }

diff --git a/tests/functional/centos/7/lvm-osds/group_vars/all b/tests/functional/centos/7/lvm-osds/group_vars/all
index a449d6d194a2b84b4e76aeaa128e20aa4a410807..5af6ddea9a4300938bfc92e9b4d1924127f295ba 100644 (file)
--- a/tests/functional/centos/7/lvm-osds/group_vars/all
+++ b/tests/functional/centos/7/lvm-osds/group_vars/all
@@ -21,7 +21,6 @@ lvm_volumes:
     data_vg: test_group
     journal_vg: journals
 os_tuning_params:
-  - { name: kernel.pid_max, value: 4194303 }
   - { name: fs.file-max, value: 26234859 }
 ceph_conf_overrides:
   global:

diff --git a/tests/functional/centos/7/lvm-osds/vagrant_variables.yml b/tests/functional/centos/7/lvm-osds/vagrant_variables.yml
index a23491cbb9e0b34aaca0f8b6139196666591d5bd..342ce5f9ca5393d58822543770a161eb166d50b0 100644 (file)
--- a/tests/functional/centos/7/lvm-osds/vagrant_variables.yml
+++ b/tests/functional/centos/7/lvm-osds/vagrant_variables.yml
@@ -70,5 +70,4 @@ vagrant_disable_synced_folder: true
 # vagrant_box_url: https://download.fedoraproject.org/pub/fedora/linux/releases/22/Cloud/x86_64/Images/Fedora-Cloud-Base-Vagrant-22-20150521.x86_64.vagrant-virtualbox.box
 
 os_tuning_params:
-  - { name: kernel.pid_max, value: 4194303 }
   - { name: fs.file-max, value: 26234859 }

diff --git a/tests/functional/ubuntu/16.04/cluster/group_vars/all b/tests/functional/ubuntu/16.04/cluster/group_vars/all
index d3574a1913f4d46468f29b3239ffd49a78d8b0b1..f55fcdbcef6e88f94b3cbfe49c8393d2ed429487 100644 (file)
--- a/tests/functional/ubuntu/16.04/cluster/group_vars/all
+++ b/tests/functional/ubuntu/16.04/cluster/group_vars/all
@@ -16,7 +16,6 @@ dedicated_devices:
   - '/dev/sdc'
 osd_scenario: non-collocated
 os_tuning_params:
-  - { name: kernel.pid_max, value: 4194303 }
   - { name: fs.file-max, value: 26234859 }
 ceph_conf_overrides:
   global:

diff --git a/tests/functional/ubuntu/16.04/cluster/group_vars/osds b/tests/functional/ubuntu/16.04/cluster/group_vars/osds
index ed9b23ad137ba22e8eb3deb381ac3e1817924e2a..77f10f0aaaec00f154dab497885a931c0093415c 100644 (file)
--- a/tests/functional/ubuntu/16.04/cluster/group_vars/osds
+++ b/tests/functional/ubuntu/16.04/cluster/group_vars/osds
@@ -1,4 +1,3 @@
 ---
 os_tuning_params:
-  - { name: kernel.pid_max, value: 4194303 }
   - { name: fs.file-max, value: 26234859 }

diff --git a/tests/functional/ubuntu/16.04/cluster/vagrant_variables.yml b/tests/functional/ubuntu/16.04/cluster/vagrant_variables.yml
index 3a5f401b0a986666dcf51640388952cc7f51447b..7a7c163c010fafa4d432ea55a7ecd7d1c8e34467 100644 (file)
--- a/tests/functional/ubuntu/16.04/cluster/vagrant_variables.yml
+++ b/tests/functional/ubuntu/16.04/cluster/vagrant_variables.yml
@@ -70,5 +70,4 @@ vagrant_disable_synced_folder: true
 # vagrant_box_url: https://download.fedoraproject.org/pub/fedora/linux/releases/22/Cloud/x86_64/Images/Fedora-Cloud-Base-Vagrant-22-20150521.x86_64.vagrant-virtualbox.box
 
 os_tuning_params:
-  - { name: kernel.pid_max, value: 4194303 }
   - { name: fs.file-max, value: 26234859 }

diff --git a/vagrant_variables.yml.linode b/vagrant_variables.yml.linode
index 78d1e33538cdc227e5cbb9f6e2c1f8645b7e6bd6..fad3e6141e722b4a366f744c580a6fdbcb5e67c2 100644 (file)
--- a/vagrant_variables.yml.linode
+++ b/vagrant_variables.yml.linode
@@ -37,5 +37,4 @@ restapi: true
 # vagrant_sync_dir: /home/vagrant/sync
 
 os_tuning_params:
-  - { name: kernel.pid_max, value: 4194303 }
   - { name: fs.file-max, value: 26234859 }

diff --git a/vagrant_variables.yml.sample b/vagrant_variables.yml.sample
index a9dcbcac6ff3a120e5bd2e4266045ee141cacdfc..b9d01331c9cbc49d1a79e99aca69e8940355d865 100644 (file)
--- a/vagrant_variables.yml.sample
+++ b/vagrant_variables.yml.sample
@@ -62,7 +62,6 @@ vagrant_sync_dir: /home/vagrant/sync
 # vagrant_box_url: https://download.fedoraproject.org/pub/fedora/linux/releases/22/Cloud/x86_64/Images/Fedora-Cloud-Base-Vagrant-22-20150521.x86_64.vagrant-virtualbox.box
 
 os_tuning_params:
-  - { name: kernel.pid_max, value: 4194303 }
   - { name: fs.file-max, value: 26234859 }
 
 # Debug mode, runs Ansible with -vvvv