From adf50179245c493b1e7194fcc4dcc5022bf24bfb Mon Sep 17 00:00:00 2001 From: =?utf8?q?S=C3=A9bastien=20Han?= Date: Wed, 20 Sep 2017 23:06:01 +0200 Subject: [PATCH] config: remove max open file MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit This is only used by the old sysvinit scripts Signed-off-by: Sébastien Han --- group_vars/all.yml.sample | 1 - group_vars/nfss.yml.sample | 4 ++++ group_vars/rhcs.yml.sample | 1 - roles/ceph-config/templates/ceph.conf.j2 | 1 - roles/ceph-defaults/defaults/main.yml | 1 - 5 files changed, 4 insertions(+), 4 deletions(-) diff --git a/group_vars/all.yml.sample b/group_vars/all.yml.sample index c648417c6..9c10d5adf 100644 --- 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 e86d55ed4..03b877253 100644 --- 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 1c255fac6..5e9f926ea 100644 --- 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 b64a3111b..db2764a4b 100644 --- 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 13c502568..f8786be1c 100644 --- 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 # -- 2.39.5