From 0c09cd3e2e30b032acdb29afbd0e7ace2f6e45b0 Mon Sep 17 00:00:00 2001
From: Ali Maredia <amaredia@redhat.com>
Date: Thu, 5 Oct 2017 16:51:23 -0400
Subject: [PATCH] nfs: config var changes

- remove unused ganesha config vars,

- set different default Export_ids for each FSAL

Signed-off-by: Ali Maredia <amaredia@redhat.com>
---
 group_vars/nfss.yml.sample       | 10 +++-------
 roles/ceph-nfs/defaults/main.yml | 10 +++-------
 2 files changed, 6 insertions(+), 14 deletions(-)

diff --git a/group_vars/nfss.yml.sample b/group_vars/nfss.yml.sample
index eb0aa08a6..b739758ef 100644
--- a/group_vars/nfss.yml.sample
+++ b/group_vars/nfss.yml.sample
@@ -35,17 +35,13 @@ dummy:
 ######################
 # NFS Ganesha Config #
 ######################
-#ceph_nfs_export_id: 20134
-#ceph_nfs_pseudo_path: "/cephfile"
-#ceph_nfs_protocols: "3,4"
-#ceph_nfs_access_type: "RW"
 #ceph_nfs_log_file: "/var/log/ganesha/ganesha.log"
 
 ####################
 # FSAL Ceph Config #
 ####################
-#ceph_nfs_ceph_export_id: 20134
-#ceph_nfs_ceph_pseudo_path: "/cephobject"
+#ceph_nfs_ceph_export_id: 20133
+#ceph_nfs_ceph_pseudo_path: "/cephfile"
 #ceph_nfs_ceph_protocols: "3,4"
 #ceph_nfs_ceph_access_type: "RW"
 #ceph_nfs_ceph_user: "admin"
@@ -54,7 +50,7 @@ dummy:
 # FSAL RGW Config #
 ###################
 #ceph_nfs_rgw_export_id: 20134
-#ceph_nfs_rgw_pseudo_path: "/ceph"
+#ceph_nfs_rgw_pseudo_path: "/cephobject"
 #ceph_nfs_rgw_protocols: "3,4"
 #ceph_nfs_rgw_access_type: "RW"
 #ceph_nfs_rgw_user: "cephnfs"
diff --git a/roles/ceph-nfs/defaults/main.yml b/roles/ceph-nfs/defaults/main.yml
index 6025d7e31..ec6bf35f1 100644
--- a/roles/ceph-nfs/defaults/main.yml
+++ b/roles/ceph-nfs/defaults/main.yml
@@ -27,17 +27,13 @@ nfs_obj_gw: true
 ######################
 # NFS Ganesha Config #
 ######################
-ceph_nfs_export_id: 20134
-ceph_nfs_pseudo_path: "/cephfile"
-ceph_nfs_protocols: "3,4"
-ceph_nfs_access_type: "RW"
 ceph_nfs_log_file: "/var/log/ganesha/ganesha.log"
 
 ####################
 # FSAL Ceph Config #
 ####################
-ceph_nfs_ceph_export_id: 20134
-ceph_nfs_ceph_pseudo_path: "/cephobject"
+ceph_nfs_ceph_export_id: 20133
+ceph_nfs_ceph_pseudo_path: "/cephfile"
 ceph_nfs_ceph_protocols: "3,4"
 ceph_nfs_ceph_access_type: "RW"
 ceph_nfs_ceph_user: "admin"
@@ -46,7 +42,7 @@ ceph_nfs_ceph_user: "admin"
 # FSAL RGW Config #
 ###################
 ceph_nfs_rgw_export_id: 20134
-ceph_nfs_rgw_pseudo_path: "/ceph"
+ceph_nfs_rgw_pseudo_path: "/cephobject"
 ceph_nfs_rgw_protocols: "3,4"
 ceph_nfs_rgw_access_type: "RW"
 ceph_nfs_rgw_user: "cephnfs"