From: Florian Haas <florian@hastexo.com>
Date: Thu, 21 Sep 2017 18:34:14 +0000 (+0200)
Subject: stable-2.2: Drop remaining ceph_nfs_rgw_* variables
X-Git-Tag: v2.2.12~2^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F1935%2Fhead;p=ceph-ansible.git

stable-2.2: Drop remaining ceph_nfs_rgw_* variables

With all references to the nfs-ganesha RGW FSAL removed from this
branch, the remaining ceph_nfs_rgw_* are no longer used
anywhere. Remove them in order to avoid potential user confusion.
---

diff --git a/group_vars/nfss.yml.sample b/group_vars/nfss.yml.sample
index 91dc917ef..0c388c9c2 100644
--- a/group_vars/nfss.yml.sample
+++ b/group_vars/nfss.yml.sample
@@ -25,8 +25,6 @@ dummy:
 #######################
 # Enable NFS File access
 #nfs_file_gw: true
-# Enable NFS Object access
-#nfs_obj_gw: false
 
 ######################
 # NFS Ganesha Config #
@@ -46,19 +44,6 @@ dummy:
 #ceph_nfs_ceph_access_type: "RW"
 #ceph_nfs_ceph_user: "admin"
 
-###################
-# FSAL RGW Config #
-###################
-#ceph_nfs_rgw_export_id: 20134
-#ceph_nfs_rgw_pseudo_path: "/ceph"
-#ceph_nfs_rgw_protocols: "3,4"
-#ceph_nfs_rgw_access_type: "RW"
-#ceph_nfs_rgw_user: "cephnfs"
-# Note: keys are optional and can be generated, but not on containerized, where
-# they must be configered.
-#ceph_nfs_rgw_access_key: "QFAMEDSJP5DEKJO0DDXY"
-#ceph_nfs_rgw_secret_key: "iaSFLDVvDdQt6lkNzHyW4fPLZugBAI1g17LO0+87[MAC[M#C"
-
 
 ###################
 # CONFIG OVERRIDE #
diff --git a/roles/ceph-nfs/defaults/main.yml b/roles/ceph-nfs/defaults/main.yml
index 31fb56a3d..f4c6fdc1d 100644
--- a/roles/ceph-nfs/defaults/main.yml
+++ b/roles/ceph-nfs/defaults/main.yml
@@ -36,19 +36,6 @@ ceph_nfs_ceph_protocols: "3,4"
 ceph_nfs_ceph_access_type: "RW"
 ceph_nfs_ceph_user: "admin"
 
-###################
-# FSAL RGW Config #
-###################
-ceph_nfs_rgw_export_id: 20134
-ceph_nfs_rgw_pseudo_path: "/ceph"
-ceph_nfs_rgw_protocols: "3,4"
-ceph_nfs_rgw_access_type: "RW"
-ceph_nfs_rgw_user: "cephnfs"
-# Note: keys are optional and can be generated, but not on containerized, where
-# they must be configered.
-#ceph_nfs_rgw_access_key: "QFAMEDSJP5DEKJO0DDXY"
-#ceph_nfs_rgw_secret_key: "iaSFLDVvDdQt6lkNzHyW4fPLZugBAI1g17LO0+87[MAC[M#C"
-
 
 ###################
 # CONFIG OVERRIDE #