defaults: remove legacy

These variables aren't consummed anywhere else than in ceph-nfs role so
there is no need to have them in `ceph-defaults`'s defaults

Signed-off-by: Guillaume Abrioux <gabrioux@redhat.com>

diff --git a/group_vars/all.yml.sample b/group_vars/all.yml.sample
index 083070f187bee26341c2505b0693ea1c847e679f..2f502d03b4457b51282090b004e10968fe2b9523 100644 (file)
--- a/group_vars/all.yml.sample
+++ b/group_vars/all.yml.sample
@@ -486,9 +486,14 @@ dummy:
 ###############
 # NFS-GANESHA #
 ###############
-
-# Confiure the type of NFS gatway access.  At least one must be enabled for an
-# NFS role to be useful
+#
+# Access type options
+#
+# Enable NFS File access
+# If set to true, then ganesha is set up to export the root of the
+# Ceph filesystem, and ganesha's attribute and directory caching is disabled
+# as much as possible since libcephfs clients also caches the same
+# information.
 #
 # Set this to true to enable File access via NFS.  Requires an MDS role.
 #nfs_file_gw: false

diff --git a/group_vars/nfss.yml.sample b/group_vars/nfss.yml.sample
index e3820bdb72f5a764ff851d768acbad031299c016..7c35af31afd40d94ed194759b3b1a8932b367b1b 100644 (file)
--- a/group_vars/nfss.yml.sample
+++ b/group_vars/nfss.yml.sample
@@ -31,19 +31,6 @@ dummy:
 # can be set by 'ceph_nfs_service_suffix'
 # ceph_nfs_service_suffix: ansible_hostname
 
-#######################
-# Access type options #
-#######################
-# These are currently in ceph-common defaults because nfs_obj_gw shared with ceph-rgw
-# Enable NFS File access
-# If set to true, then ganesha is set up to export the root of the
-# Ceph filesystem, and ganesha's attribute and directory caching is disabled
-# as much as possible since libcephfs clients also caches the same
-# information.
-#nfs_file_gw: false
-# Enable NFS Object access
-#nfs_obj_gw: true
-
 ######################
 # NFS Ganesha Config #
 ######################

diff --git a/group_vars/rhcs.yml.sample b/group_vars/rhcs.yml.sample
index ad8c6511e133b639d836451e73103a8134b2d307..654d5329d27bcd71116b34be8f3a2257e5487a40 100644 (file)
--- a/group_vars/rhcs.yml.sample
+++ b/group_vars/rhcs.yml.sample
@@ -486,9 +486,14 @@ ceph_iscsi_config_dev: false
 ###############
 # NFS-GANESHA #
 ###############
-
-# Confiure the type of NFS gatway access.  At least one must be enabled for an
-# NFS role to be useful
+#
+# Access type options
+#
+# Enable NFS File access
+# If set to true, then ganesha is set up to export the root of the
+# Ceph filesystem, and ganesha's attribute and directory caching is disabled
+# as much as possible since libcephfs clients also caches the same
+# information.
 #
 # Set this to true to enable File access via NFS.  Requires an MDS role.
 #nfs_file_gw: false

diff --git a/roles/ceph-defaults/defaults/main.yml b/roles/ceph-defaults/defaults/main.yml
index 621307115fef0edb8d510d814cfea009cd2b86c7..c28473a16f2405ef584e01acca8b54c7cd8708aa 100644 (file)
--- a/roles/ceph-defaults/defaults/main.yml
+++ b/roles/ceph-defaults/defaults/main.yml
@@ -478,9 +478,14 @@ health_osd_check_delay: 10
 ###############
 # NFS-GANESHA #
 ###############
-
-# Confiure the type of NFS gatway access.  At least one must be enabled for an
-# NFS role to be useful
+#
+# Access type options
+#
+# Enable NFS File access
+# If set to true, then ganesha is set up to export the root of the
+# Ceph filesystem, and ganesha's attribute and directory caching is disabled
+# as much as possible since libcephfs clients also caches the same
+# information.
 #
 # Set this to true to enable File access via NFS.  Requires an MDS role.
 nfs_file_gw: false

diff --git a/roles/ceph-nfs/defaults/main.yml b/roles/ceph-nfs/defaults/main.yml
index adc9f5b14b5911cb27b600dddba525ee2756b669..2d07985d1ff2ac41e98c3ff044a7a0266f93351b 100644 (file)
--- a/roles/ceph-nfs/defaults/main.yml
+++ b/roles/ceph-nfs/defaults/main.yml
@@ -23,19 +23,6 @@ ceph_nfs_enable_service: true
 # can be set by 'ceph_nfs_service_suffix'
 # ceph_nfs_service_suffix: ansible_hostname
 
-#######################
-# Access type options #
-#######################
-# These are currently in ceph-common defaults because nfs_obj_gw shared with ceph-rgw
-# Enable NFS File access
-# If set to true, then ganesha is set up to export the root of the
-# Ceph filesystem, and ganesha's attribute and directory caching is disabled
-# as much as possible since libcephfs clients also caches the same
-# information.
-nfs_file_gw: false
-# Enable NFS Object access
-nfs_obj_gw: true
-
 ######################
 # NFS Ganesha Config #
 ######################