From: Guillaume Abrioux <gabrioux@redhat.com>
Date: Thu, 9 Jul 2020 13:03:48 +0000 (+0200)
Subject: defaults: remove legacy
X-Git-Tag: v6.0.0alpha2~112
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=d490968fc8b5e4fcc236b21cc2debd486780268e;p=ceph-ansible.git

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 083070f18..2f502d03b 100644
--- 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 e3820bdb7..7c35af31a 100644
--- 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 ad8c6511e..654d5329d 100644
--- 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 621307115..c28473a16 100644
--- 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 adc9f5b14..2d07985d1 100644
--- 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 #
 ######################