Skip to content

Commit

Permalink
mgr/volumes: fix "ceph nfs export" help messages
Browse files Browse the repository at this point in the history
They say "<attach>" but they mean "<clusterid>".

Fixes: https://tracker.ceph.com/issues/46572
Signed-off-by: Nathan Cutler <[email protected]>
  • Loading branch information
smithfarm committed Jul 16, 2020
1 parent 1e6364f commit b2dcdef
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions src/pybind/mgr/volumes/module.py
Original file line number Diff line number Diff line change
Expand Up @@ -256,7 +256,7 @@ class Module(orchestrator.OrchestratorClientMixin, MgrModule):
{
'cmd': 'nfs export create cephfs '
'name=fsname,type=CephString '
'name=attach,type=CephString '
'name=clusterid,type=CephString '
'name=binding,type=CephString '
'name=readonly,type=CephBool,req=false '
'name=path,type=CephString,req=false ',
Expand All @@ -265,7 +265,7 @@ class Module(orchestrator.OrchestratorClientMixin, MgrModule):
},
{
'cmd': 'nfs export delete '
'name=attach,type=CephString '
'name=clusterid,type=CephString '
'name=binding,type=CephString ',
'desc': "Delete a cephfs export",
'perm': 'rw'
Expand Down Expand Up @@ -507,11 +507,11 @@ def _cmd_fs_clone_cancel(self, inbuf, cmd):

def _cmd_nfs_export_create_cephfs(self, inbuf, cmd):
#TODO Extend export creation for rgw.
return self.fs_export.create_export(fs_name=cmd['fsname'], cluster_id=cmd['attach'],
return self.fs_export.create_export(fs_name=cmd['fsname'], cluster_id=cmd['clusterid'],
pseudo_path=cmd['binding'], read_only=cmd.get('readonly', False), path=cmd.get('path', '/'))

def _cmd_nfs_export_delete(self, inbuf, cmd):
return self.fs_export.delete_export(cluster_id=cmd['attach'], pseudo_path=cmd['binding'])
return self.fs_export.delete_export(cluster_id=cmd['clusterid'], pseudo_path=cmd['binding'])

def _cmd_nfs_export_ls(self, inbuf, cmd):
return self.fs_export.list_exports(cluster_id=cmd['clusterid'], detailed=cmd.get('detailed', False))
Expand Down

0 comments on commit b2dcdef

Please sign in to comment.