From: Adam King <adking@redhat.com>
Date: Wed, 10 Aug 2022 19:58:44 +0000 (-0400)
Subject: mgr/cephadm: set dashboard grafana-api-password when user provides one
X-Git-Tag: v16.2.11~342^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=41d5f0839ecbc28a78f1b249b1ace2447ffc1f1f;p=ceph.git

mgr/cephadm: set dashboard grafana-api-password when user provides one

If a user provides this in the spec, cephadm will set up the inital admin
user with the given password, but the conig setting accessed with
"ceph dashboard get-grafana-api-password" is never updated. Cephadm
can handle updating it since it's the one setting the password.

Fixes: https://tracker.ceph.com/issues/57095

Signed-off-by: Adam King <adking@redhat.com>
(cherry picked from commit c7d84f93b11915b2668af225eedd33781bb9a07b)

Conflicts:
	src/pybind/mgr/cephadm/services/ingress.py
---

diff --git a/src/pybind/mgr/cephadm/services/monitoring.py b/src/pybind/mgr/cephadm/services/monitoring.py
index bebd246f074..9c2a08b6d70 100644
--- a/src/pybind/mgr/cephadm/services/monitoring.py
+++ b/src/pybind/mgr/cephadm/services/monitoring.py
@@ -68,6 +68,10 @@ class GrafanaService(CephadmService):
                 'http_addr': daemon_spec.ip if daemon_spec.ip else ''
             })
 
+        if 'dashboard' in self.mgr.get('mgr_map')['modules'] and spec.initial_admin_password:
+            self.mgr.check_mon_command(
+                {'prefix': 'dashboard set-grafana-api-password'}, inbuf=spec.initial_admin_password)
+
         config_file = {
             'files': {
                 "grafana.ini": grafana_ini,