Merge PR #33614 into master

* refs/pull/33614/head:
	mgr/cephadm: enable custom TLS certificates for grafana
	mgr: enable verification of TLS certs without files
	mgr/cephadm: dump config to JSON only once when creating daemons

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

diff --cc src/pybind/mgr/cephadm/module.py
index 25e37b89d4d3928f36394fe93684a4acf7acea10,d6106ab8d96e29c6437e4fe19c2f66bc2f9ed9fc..8ca39852a9a5497a00dbdbb738c0b1335f19abe5
--- 1/src/pybind/mgr/cephadm/module.py
--- 2/src/pybind/mgr/cephadm/module.py
+++ b/src/pybind/mgr/cephadm/module.py
@@@ -2678,7 -2635,9 +2688,8 @@@ receivers
          # type: (orchestrator.ServiceSpec) -> AsyncCompletion
          return self._apply(spec)
  
 -    @async_map_completion
      def _create_grafana(self, daemon_id, host):
+         # type: (str, str) -> str
          return self._create_daemon('grafana', daemon_id, host)
  
      def add_alertmanager(self, spec):