Skip to content

mgr/cephadm: provision nfs-ganesha via orchestrator#33581

Merged
liewegas merged 23 commits intoceph:masterfrom
mgfritch:cephadm-mgr-nfs-ganesha
Mar 26, 2020
Merged

mgr/cephadm: provision nfs-ganesha via orchestrator#33581
liewegas merged 23 commits intoceph:masterfrom
mgfritch:cephadm-mgr-nfs-ganesha

Conversation

@mgfritch
Copy link
Contributor

@mgfritch mgfritch commented Feb 27, 2020 •
edited
Loading

Enables provisioning NFS ganesha via the Orchestrator

$ ceph orch apply nfs foo cephfs.a.data nfs-ns
Scheduled nfs update...

Fixes: https://tracker.ceph.com/issues/44718
Signed-off-by: Michael Fritch mfritch@suse.com

Checklist

  • References tracker ticket
  • Updates documentation if necessary
  • Includes tests for new functionality or reproducer for bug
Show available Jenkins commands
  • jenkins retest this please
  • jenkins test crimson perf
  • jenkins test signed
  • jenkins test make check
  • jenkins test make check arm64
  • jenkins test submodules
  • jenkins test dashboard
  • jenkins test dashboard backend
  • jenkins test docs
  • jenkins render docs
  • jenkins test ceph-volume all
  • jenkins test ceph-volume tox

@mgfritch mgfritch requested a review from a team as a code owner February 27, 2020 15:01
@mgfritch
Copy link
Contributor Author

mgfritch commented Feb 27, 2020

To be merged after #33064

@mgfritch mgfritch force-pushed the cephadm-mgr-nfs-ganesha branch from 5a0a1a2 to 25cc81d Compare February 28, 2020 17:04
batrick
batrick previously requested changes Feb 29, 2020
View reviewed changes
This was referenced Mar 2, 2020
Merged
Merged
@mgfritch mgfritch changed the base branch from master to octopus March 9, 2020 17:53
@mgfritch mgfritch added this to the octopus milestone Mar 9, 2020
@mgfritch mgfritch force-pushed the cephadm-mgr-nfs-ganesha branch from 25cc81d to 27e0611 Compare March 9, 2020 18:55
@mgfritch mgfritch force-pushed the cephadm-mgr-nfs-ganesha branch from c19b882 to 586c24a Compare March 11, 2020 00:57
@sebastian-philipp
Copy link
Contributor

sebastian-philipp commented Mar 12, 2020

needs rebase

varshar16
varshar16 reviewed Mar 13, 2020
View reviewed changes
varshar16
varshar16 reviewed Mar 13, 2020
View reviewed changes
varshar16
varshar16 reviewed Mar 13, 2020
View reviewed changes
@mgfritch mgfritch force-pushed the cephadm-mgr-nfs-ganesha branch from 586c24a to fa15618 Compare March 15, 2020 23:44
mgfritch
mgfritch commented Mar 16, 2020
View reviewed changes
@mgfritch mgfritch force-pushed the cephadm-mgr-nfs-ganesha branch from fa15618 to 6b39e28 Compare March 16, 2020 00:17
@mgfritch
Copy link
Contributor Author

mgfritch commented Mar 16, 2020

jenkins test make check

sebastian-philipp
sebastian-philipp reviewed Mar 16, 2020
View reviewed changes
Copy link
Contributor

@sebastian-philipp sebastian-philipp left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

looks great!

@mgfritch mgfritch force-pushed the cephadm-mgr-nfs-ganesha branch from 6b39e28 to 90a3654 Compare March 17, 2020 18:25
mgfritch added 20 commits March 25, 2020 16:26
@mgfritch
mgr/cephadm: add a minimal ganesha.conf
2606cc3 
we only need to specify the rados pool and config object url

Signed-off-by: Michael Fritch <mfritch@suse.com>
@mgfritch
mgr/cephadm: add nfs tests
b2b6e01 
Signed-off-by: Michael Fritch <mfritch@suse.com>
@mgfritch
mgr/cephadm: create empty nfs rados config obj
9103f47 
Signed-off-by: Michael Fritch <mfritch@suse.com>
@mgfritch
mgr/cephadm: add logging to NFSGanesha class
26ea33a 
Signed-off-by: Michael Fritch <mfritch@suse.com>
@mgfritch
mgr/cephadm: add minimal caps for nfs client keyring
94600c6 
Signed-off-by: Michael Fritch <mfritch@suse.com>
@mgfritch
mgr/cephadm: update docs
530c62d 
Signed-off-by: Michael Fritch <mfritch@suse.com>
@mgfritch
mgr/cephadm: don't create a unique nfs daemon name
8182317 
only one nfs daemon will be deployed per host

Signed-off-by: Michael Fritch <mfritch@suse.com>
@mgfritch
mgr/cephadm: apply nfs service spec
76f2789 
orch apply nfs <svc_id> [<placement>]

Signed-off-by: Michael Fritch <mfritch@suse.com>
@mgfritch
mgr/cephadm: fix service name for nfs type
d9f04ec 
the `nfs` service was incorrectly reported as `mds`

Signed-off-by: Michael Fritch <mfritch@suse.com>
@mgfritch
mgr/cephadm: ensure nfs uses the correct entity
fd6322f 
mon entity needs to start with `client.`

Signed-off-by: Michael Fritch <mfritch@suse.com>
@mgfritch
mgr/cephadm: fix nfs redeploy/reconfig
1078858 
search for the `NFSServiceSpec` instead of passing empty
`cephadm_args` during `_create_daemon`

Signed-off-by: Michael Fritch <mfritch@suse.com>
@mgfritch
mgr/cephadm: add nfs apply test
78ce6d4 
Signed-off-by: Michael Fritch <mfritch@suse.com>
@mgfritch
mgr/cephadm: pass NFSServiceSpec instead of pool/namespace args
8bb79a5 
Signed-off-by: Michael Fritch <mfritch@suse.com>
@mgfritch
mgr/cephadm: create/update keyring during nfs config
084fd4a 
the keyring might already exist from a prior config/reconfig/redeploy.

attempt to get_or_create the keyring first and than update the keyring
caps afterward

Signed-off-by: Michael Fritch <mfritch@suse.com>
@mgfritch
mgr/cephadm: add utils.py
322eea8 
move `name_to_config_section` and `assert_valid_host` into utils.py

Signed-off-by: Michael Fritch <mfritch@suse.com>
@mgfritch
mgr/cephadm: add deployment example to NFS docs
77440d9 
Signed-off-by: Michael Fritch <mfritch@suse.com>
@mgfritch
mon: allow auth caps for mgr profile
ef8a46a 
cephadm orchestrator needs to update the caps during reconfig/redeploy

Signed-off-by: Michael Fritch <mfritch@suse.com>
@mgfritch
mgr/cephadm: combine get_daemon_name and get_rados_user funcs
fdf90bf 
Signed-off-by: Michael Fritch <mfritch@suse.com>
@mgfritch
mgr/cephadm: check for an existing NFS config object
75b988f 
assume an existing NFS config if the named rados object already exists

Signed-off-by: Michael Fritch <mfritch@suse.com>
@mgfritch
mgr/cephadm: add watch_url to NFS bootstrap config
ff92651 
watch for changes to the per-daemon RADOS conf file

Signed-off-by: Michael Fritch <mfritch@suse.com>
@mgfritch mgfritch force-pushed the cephadm-mgr-nfs-ganesha branch from dde5aa5 to ff92651 Compare March 25, 2020 22:26
@mgfritch
Copy link
Contributor Author

mgfritch commented Mar 25, 2020

this appears to have broken the grafana deployment.. see http://pulpito.ceph.com/sage-2020-03-25_16:29:41-rados:cephadm-wip-sage2-testing-2020-03-25-1021-distro-basic-smithi/

looks like the --config-json arg was accidentally dropped for type grafana ... fixed.

@liewegas liewegas dismissed batrick’s stale review March 26, 2020 01:21

significant revisions since then!

@liewegas liewegas mentioned this pull request Mar 26, 2020
Merged
@liewegas liewegas merged commit 8d514b5 into ceph:master Mar 26, 2020
@mgfritch mgfritch deleted the cephadm-mgr-nfs-ganesha branch March 26, 2020 02:50
@sebastian-philipp
Copy link
Contributor

sebastian-philipp commented Mar 26, 2020

@varshar16 now, you can actually look into calling orchestrator.Orchestrator.apply_nfs(...)!

sebastian-philipp added a commit to sebastian-philipp/ceph that referenced this pull request Mar 26, 2020
@sebastian-philipp
mgr/cephadm: Add missing decorator
8e90f31 
Caused by a conflict between

* ceph#33581 (770816d) and
* ceph#34091 (a78f42e)

Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
@sebastian-philipp sebastian-philipp mentioned this pull request Mar 26, 2020
Merged
3 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@liewegas liewegas liewegas left review comments

@varshar16 varshar16 Awaiting requested review from varshar16

@batrick batrick Awaiting requested review from batrick

+2 more reviewers

@jtlayton jtlayton jtlayton left review comments

@sebastian-philipp sebastian-philipp sebastian-philipp approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

cephadm needs-qa orchestrator wip-sage2-testing

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

6 participants

@mgfritch @sebastian-philipp @liewegas @varshar16 @batrick @jtlayton