From: Sage Weil <sage@redhat.com>
Date: Fri, 6 Mar 2020 17:26:47 +0000 (-0600)
Subject: Merge PR #33614 into master
X-Git-Tag: v15.1.1~85
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=92c3989fc4a13eb02509b20009644c35d48dcf01;p=ceph.git

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>
---

92c3989fc4a13eb02509b20009644c35d48dcf01
diff --cc src/pybind/mgr/cephadm/module.py
index 25e37b89d4d39,d6106ab8d96e2..8ca39852a9a54
--- a/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):