Merge pull request #6839 from varshar16/remove-ganesha-prefix-rados-config-obj

ceph: remove 'ganesha-' from nfs-ganesha config object name

Documentation/ceph-nfs-crd.md

@@ -78,7 +78,7 @@ spec:
 All daemons within a cluster will share configuration with no exports defined, and that includes a RADOS object via:
 
 ```ini
-%url  rados://<pool>/<namespace>/conf-nfs.ganesha-<clustername>
+%url  rados://<pool>/<namespace>/conf-nfs.<clustername>
 ```
 
 > **NOTE**: This format of nfs-ganesha config object name was introduced in Ceph Octopus Version. In older versions, each daemon has it's own config object and with the name as *conf-<clustername>.<nodeid>*. The nodeid is a value automatically assigned internally by rook. Nodeids start with "a" and go through "z", at which point they become two letters ("aa" to "az").

pkg/operator/ceph/nfs/config.go

@@ -49,8 +49,12 @@ func getNFSNodeID(n *cephv1.CephNFS, name string) string {
 }
 
 func getGaneshaConfigObject(n *cephv1.CephNFS, version cephver.CephVersion, name string) string {
+	/* Exports created with Dashboard will not be affected by change in config object name.
+	 * As it looks for ganesha config object just by 'conf-'. Exports cannot be created by using
+	 * volume/nfs plugin in Octopus version. Because the ceph rook module is broken.
+	 */
 	if version.IsAtLeastOctopus() {
-		return fmt.Sprintf("conf-nfs.ganesha-%s", n.Name)
+		return fmt.Sprintf("conf-nfs.%s", n.Name)
 	}
 	return fmt.Sprintf("conf-%s", getNFSNodeID(n, name))
 }

pkg/operator/ceph/nfs/controller_test.go

@@ -264,7 +264,7 @@ func TestGetGaneshaConfigObject(t *testing.T) {
 		},
 	}
 	nodeid := "a"
-	expectedName := "conf-nfs.ganesha-my-nfs"
+	expectedName := "conf-nfs.my-nfs"
 
 	res := getGaneshaConfigObject(cephNFS, cephver.CephVersion{Major: 16}, nodeid)
 	logger.Infof("Config Object for Pacific is %s", res)