From: Adam King <47704447+adk3798@users.noreply.github.com>
Date: Thu, 6 Oct 2022 00:22:09 +0000 (-0400)
Subject: Merge pull request #46925 from rkachach/fix_issue_44461
X-Git-Tag: v18.1.0~1067
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=dc47193f6ff5fff92b2bdff1f3ed25ef9f8c2be7;p=ceph.git

Merge pull request #46925 from rkachach/fix_issue_44461

mgr/cephadm: add a simple mechanism to check grafana cert/key

Reviewed-by: Adam King <adking@redhat.com>
---

dc47193f6ff5fff92b2bdff1f3ed25ef9f8c2be7
diff --cc src/pybind/mgr/cephadm/tests/test_services.py
index cc1d4575517b3,98b5b58ce298d..5c1a42d3ea37f
--- a/src/pybind/mgr/cephadm/tests/test_services.py
+++ b/src/pybind/mgr/cephadm/tests/test_services.py
@@@ -540,10 -537,10 +544,10 @@@ class TestMonitoring
          _run_cephadm.side_effect = async_side_effect(("{}", "", 0))
  
          with with_host(cephadm_module, "test"):
-             cephadm_module.set_store("test/grafana_crt", "c")
-             cephadm_module.set_store("test/grafana_key", "k")
+             cephadm_module.set_store("test/grafana_crt", grafana_cert)
+             cephadm_module.set_store("test/grafana_key", grafana_key)
              with with_service(
 -                cephadm_module, MonitoringSpec("prometheus")
 +                cephadm_module, PrometheusSpec("prometheus")
              ) as _, with_service(cephadm_module, ServiceSpec("mgr")) as _, with_service(
                  cephadm_module, GrafanaSpec("grafana")
              ) as _: