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 <rimarques@suse.com>
(cherry picked from commit 6f8aa25f645cdec1514daecc9b36264fa572234a)

diff --git a/src/cephadm/cephadm b/src/cephadm/cephadm
index f1e44ee769e8d8fe29a702ecce32cfaaad7f0305..c0f6a051f7f35395fd2b77fc4c864663b88a3410 100755 (executable)
--- 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...')