Merge PR #33461 into master

* refs/pull/33461/head:
	cephadm: Simplify is_available
	cephadm: Improve type signature of is_available
	cephadm: Fix type errors found by mypy
	cephadm: Enable and start chrony using any packager
	cephadm: Add Packager for Zypper (openSUSE / SLES)
	cephadm: Normalize mypy annotations

Reviewed-by: Sage Weil <sage@redhat.com>

diff --cc src/cephadm/cephadm
index 0a5bc4ad7cf986ea135ab301ec44dad2fd636469,b58deb0360c57cd235d8cc890aa71391adcef63d..7f3e5e1bcac149be9c34aca73c027ac329482160
--- 1/src/cephadm/cephadm
--- 2/src/cephadm/cephadm
+++ b/src/cephadm/cephadm
@@@ -1977,21 -1982,10 +1984,21 @@@ def command_bootstrap()
              timeout=args.timeout if args.timeout else 30 # seconds
              out = cli(['-h'], timeout=timeout)
              return 'dashboard' in out
-         is_available('Dashboard', is_dashboard_available)()
+         is_available('Dashboard', is_dashboard_available)
  
 -        logger.info('Generating a dashboard self-signed certificate...')
 -        cli(['dashboard', 'create-self-signed-cert'])
 +
 +
 +        # dashboard crt and key
 +        if args.dashboard_key and args.dashboard_crt:
 +            logger.info('Using provided dashboard certificate...')
 +            mounts = {}
 +            mounts[pathify(args.dashboard_crt)] = '/tmp/dashboard.crt:z'
 +            mounts[pathify(args.dashboard_key)] = '/tmp/dashboard.key:z'
 +            cli(['dashboard', 'set-ssl-certificate', '-i', '/tmp/dashboard.crt'], extra_mounts=mounts)
 +            cli(['dashboard', 'set-ssl-certificate-key', '-i', '/tmp/dashboard.key'], extra_mounts=mounts)
 +        else:
 +            logger.info('Generating a dashboard self-signed certificate...')
 +            cli(['dashboard', 'create-self-signed-cert'])
  
          logger.info('Creating initial admin user...')
          password = args.initial_dashboard_password or generate_password()