config: remove max open file

This is only used by the old sysvinit scripts

Signed-off-by: Sébastien Han <seb@redhat.com>

diff --git a/group_vars/all.yml.sample b/group_vars/all.yml.sample
index c648417c6c5bb2c4ab1d9f162e089f8ab24fb2ed..9c10d5adfb3cbdd7c059953e88553685bea81940 100644 (file)
--- a/group_vars/all.yml.sample
+++ b/group_vars/all.yml.sample
@@ -253,7 +253,6 @@ dummy:
 #ceph_conf_key_directory: /etc/ceph
 
 #cephx: true
-#max_open_files: 131072
 
 ## Client options
 #

diff --git a/group_vars/nfss.yml.sample b/group_vars/nfss.yml.sample
index e86d55ed43d9581ff210b972606193cd2aa5a153..03b8772537b57be2ede7093a2cd5f5fb8a2b8a0f 100644 (file)
--- a/group_vars/nfss.yml.sample
+++ b/group_vars/nfss.yml.sample
@@ -18,6 +18,10 @@ dummy:
 # distributed on RGW nodes. Setting 'copy_admin_key' to 'true'
 # will copy the admin key to the /etc/ceph/ directory
 #copy_admin_key: false
+# whether docker container or systemd service should be enabled
+# and started, it's useful to set it to false if nfs-ganesha
+# service is managed by pacemaker
+#ceph_nfs_enable_service: true
 
 #######################
 # Access type options #

diff --git a/group_vars/rhcs.yml.sample b/group_vars/rhcs.yml.sample
index 1c255fac668b9241aeaeaab3baed6d78d9b2da96..5e9f926eaa13957f0d14ec36b71db6e8b8aae950 100644 (file)
--- a/group_vars/rhcs.yml.sample
+++ b/group_vars/rhcs.yml.sample
@@ -253,7 +253,6 @@ ceph_repository: rhcs
 #ceph_conf_key_directory: /etc/ceph
 
 #cephx: true
-#max_open_files: 131072
 
 ## Client options
 #

diff --git a/roles/ceph-config/templates/ceph.conf.j2 b/roles/ceph-config/templates/ceph.conf.j2
index b64a3111b87db84932b854d7620e88d94f5af029..db2764a4bf3e0254ac00d9a2c353a40ed11bccce 100644 (file)
--- a/roles/ceph-config/templates/ceph.conf.j2
+++ b/roles/ceph-config/templates/ceph.conf.j2
@@ -14,7 +14,6 @@ ms bind ipv6 = true
 {% if not containerized_deployment_with_kv and not containerized_deployment %}
 fsid = {{ fsid }}
 {% endif %}
-max open files = {{ max_open_files }}
 {% if common_single_host_mode is defined and common_single_host_mode %}
 osd crush chooseleaf type = 0
 {% endif %}

diff --git a/roles/ceph-defaults/defaults/main.yml b/roles/ceph-defaults/defaults/main.yml
index 13c50256830e841e08581d3c7c618643b520255f..f8786be1ccd717b382e5f047cec9978941eae1ae 100644 (file)
--- a/roles/ceph-defaults/defaults/main.yml
+++ b/roles/ceph-defaults/defaults/main.yml
@@ -245,7 +245,6 @@ generate_fsid: true
 ceph_conf_key_directory: /etc/ceph
 
 cephx: true
-max_open_files: 131072
 
 ## Client options
 #