From: Sage Weil Date: Wed, 28 Apr 2021 18:26:35 +0000 (-0400) Subject: Merge PR #40941 into master X-Git-Tag: v17.1.0~2123 X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=75480f52e4c2893024d363fa7399652c7c5b931b;p=ceph.git Merge PR #40941 into master * 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 Reviewed-by: Adam King --- 75480f52e4c2893024d363fa7399652c7c5b931b