]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge PR #40941 into master
authorSage Weil <sage@newdream.net>
Wed, 28 Apr 2021 18:26:35 +0000 (14:26 -0400)
committerSage Weil <sage@newdream.net>
Wed, 28 Apr 2021 18:26:35 +0000 (14:26 -0400)
* refs/pull/40941/head:
qa/suites/rados/cephadm/smoke-roleless: test client-keyring
qa/tasks/cephadm.py: adjust client.admin key mode; place on all hosts
cephadm: distribute client.admin keyring+conf to label:_admin on bootstrap
doc/cephadm: document the default 'admin' label
mgr/cephadm: 'ceph orch client-keyring ...' commands to manage keyring files
mgr/cephadm: reimplement ceph.conf pushing
mgr/cephadm: use _write_remote_file for ceph.conf
mgr/cephadm: _write_remote_file helper
mgr/cephadm: add placementspec for which hosts get ceph.conf

Reviewed-by: Sebastian Wagner <swagner@suse.com>
Reviewed-by: Adam King <adking@redhat.com>
1  2 
qa/tasks/cephadm.py
src/cephadm/cephadm
src/pybind/mgr/cephadm/inventory.py
src/pybind/mgr/cephadm/module.py
src/pybind/mgr/cephadm/serve.py
src/pybind/mgr/cephadm/tests/test_cephadm.py

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge