From: Redouane Kachach Date: Thu, 21 Apr 2022 10:01:44 +0000 (+0200) Subject: mgr/cephadm: do not add _admin label when no-minimize-config is provided X-Git-Tag: v16.2.11~578^2~6 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=f5a4f7047e4d3c457c2a80cb6aea829be7eaa20d;p=ceph.git mgr/cephadm: do not add _admin label when no-minimize-config is provided Fixes: https://tracker.ceph.com/issues/52727 Signed-off-by: Redouane Kachach (cherry picked from commit 01c8999d0354a71a7ef8526aab9b39e30d67c1bb) --- diff --git a/src/cephadm/cephadm b/src/cephadm/cephadm index 3088d3e3e6c0..e8325e9ca4a3 100755 --- a/src/cephadm/cephadm +++ b/src/cephadm/cephadm @@ -4718,7 +4718,7 @@ def command_bootstrap(ctx): if not ctx.skip_dashboard: prepare_dashboard(ctx, uid, gid, cli, wait_for_mgr_restart) - if ctx.output_config == '/etc/ceph/ceph.conf' and not ctx.skip_admin_label: + if ctx.output_config == '/etc/ceph/ceph.conf' and not ctx.skip_admin_label and not ctx.no_minimize_config: logger.info('Enabling client.admin keyring and conf on hosts with "admin" label') try: cli(['orch', 'client-keyring', 'set', 'client.admin', 'label:_admin'])