From: Sage Weil <sage@redhat.com>
Date: Thu, 26 Mar 2020 19:47:55 +0000 (-0500)
Subject: mgr/cephadm: disable dashboard's grafana cert ssl_verify if we generate it
X-Git-Tag: v16.1.0~2640^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=81b78265a32cdf2d316dc341fdeb5974dc8c5e29;p=ceph.git

mgr/cephadm: disable dashboard's grafana cert ssl_verify if we generate it

This will help dashboard work out of the box.

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

diff --git a/src/pybind/mgr/cephadm/module.py b/src/pybind/mgr/cephadm/module.py
index 94e30cd4893..69eda8f9623 100644
--- a/src/pybind/mgr/cephadm/module.py
+++ b/src/pybind/mgr/cephadm/module.py
@@ -2993,6 +2993,12 @@ datasources:
             cert, pkey = create_self_signed_cert('Ceph', 'cephadm')
             self.set_store('grafana_crt', cert)
             self.set_store('grafana_key', pkey)
+            self.mon_command({
+                'prefix': 'dashboard set-grafana-api-ssl-verify',
+                'value': 'false',
+            })
+
+
 
         config_file = {
             'files': {