]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge PR #33098 into master
authorSage Weil <sage@redhat.com>
Sat, 8 Feb 2020 01:12:43 +0000 (19:12 -0600)
committerSage Weil <sage@redhat.com>
Sat, 8 Feb 2020 01:12:43 +0000 (19:12 -0600)
* refs/pull/33098/head:
mgr/orch,cephadm: add 'host set-addr'
mgr/orch: include addr (and labels) in 'host ls'
mgr/cephadm: fix 'cephadm check-host'
mgr/cephadm: use addr to contact host
mgr/orch: pass HostSpec to add_host
mgr/orch: HostSpec -> HostPlacementSpec

Reviewed-by: Sebastian Wagner <swagner@suse.com>
1  2 
src/pybind/mgr/cephadm/module.py
src/pybind/mgr/orchestrator_cli/module.py

Simple merge