From: pcuzner <pcuzner@redhat.com>
Date: Thu, 27 Jul 2017 19:59:06 +0000 (+1200)
Subject: Merge pull request #81 from zmc/wip-passwd
X-Git-Tag: v1.0~39
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=c2875a84329a2d5073eadb2c3067494fd0244871;p=cephmetrics.git

Merge pull request #81 from zmc/wip-passwd

ansible: Support non-default Grafana password
---

c2875a84329a2d5073eadb2c3067494fd0244871
diff --cc ansible/roles/ceph-grafana/templates/dashboard.yml
index 3cf4718,7360451..b8e62d0
--- a/ansible/roles/ceph-grafana/templates/dashboard.yml
+++ b/ansible/roles/ceph-grafana/templates/dashboard.yml
@@@ -14,10 -14,8 +14,10 @@@ _dashboards
    - latency-by-server
    - network-usage-by-node
    - osd-node-detail
 +  - alert-status
  _credentials:
    user: admin
-   password: admin
+   password: {{ grafana.admin_password }}
  _grafana_port: 3000
  _home_dashboard: ceph-at-a-glance
 +_alert_dashboard: alert-status