diff --git a/src/cephadm/cephadm b/src/cephadm/cephadm index 16965d61bb5..2c34d6e5f2c 100755 --- a/src/cephadm/cephadm +++ b/src/cephadm/cephadm @@ -190,6 +190,7 @@ class NFSGanesha(object): # config-json options self.pool = json_get('pool', require=True) self.namespace = json_get('namespace') + self.userid = json_get('userid') self.extra_args = json_get('extra_args', []) self.files = json_get('files', {}) @@ -308,6 +309,8 @@ class NFSGanesha(object): args=['--pool', self.pool] if self.namespace: args += ['--ns', self.namespace] + if self.userid: + args += ['--userid', self.userid] args += [action, self.get_daemon_name()] data_dir = get_data_dir(self.fsid, self.daemon_type, self.daemon_id) diff --git a/src/pybind/mgr/cephadm/nfs.py b/src/pybind/mgr/cephadm/nfs.py index adc0fc3c3b1..547047b6b00 100644 --- a/src/pybind/mgr/cephadm/nfs.py +++ b/src/pybind/mgr/cephadm/nfs.py @@ -109,6 +109,7 @@ RADOS_URLS {{ config = {'pool' : self.spec.pool} # type: Dict if self.spec.namespace: config['namespace'] = self.spec.namespace + config['userid'] = self.get_rados_user() config['extra_args'] = ['-N', 'NIV_EVENT'] config['files'] = { 'ganesha.conf' : self.get_ganesha_conf(),