From: Ricardo Marques Date: Thu, 30 Jul 2020 14:48:21 +0000 (+0100) Subject: cephadm: Fix error bootstraping with '--registry-json' X-Git-Tag: v15.2.5~86^2~1 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=6bf0850880e46a26e3d68bfefa24f267be485446;p=ceph.git cephadm: Fix error bootstraping with '--registry-json' We need to force setting registry auth options because these options are unknown before the mgr first starts and registers them. Fixes: https://tracker.ceph.com/issues/46777 Signed-off-by: Ricardo Marques (cherry picked from commit 6f8aa25f645cdec1514daecc9b36264fa572234a) --- diff --git a/src/cephadm/cephadm b/src/cephadm/cephadm index f1e44ee769e8..c0f6a051f7f3 100755 --- a/src/cephadm/cephadm +++ b/src/cephadm/cephadm @@ -2915,9 +2915,9 @@ def command_bootstrap(): cli(['orch', 'apply', t]) if args.registry_url and args.registry_username and args.registry_password: - cli(['config', 'set', 'mgr', 'mgr/cephadm/registry_url', args.registry_url]) - cli(['config', 'set', 'mgr', 'mgr/cephadm/registry_username', args.registry_username]) - cli(['config', 'set', 'mgr', 'mgr/cephadm/registry_password', args.registry_password]) + cli(['config', 'set', 'mgr', 'mgr/cephadm/registry_url', args.registry_url, '--force']) + cli(['config', 'set', 'mgr', 'mgr/cephadm/registry_username', args.registry_username, '--force']) + cli(['config', 'set', 'mgr', 'mgr/cephadm/registry_password', args.registry_password, '--force']) if not args.skip_dashboard: logger.info('Enabling the dashboard module...')