Fix grafana username and password not being set

so despite having a grafana username and grafna password
setting in all.yml these values are never actually changed
in the config file for grafana. This adds that

Change-Id: I75fe6c3c34f51ab62482974af0c3b5da190e4c39
This commit is contained in:
jkilpatr 2017-01-09 15:45:18 -05:00
parent 27c234c8e4
commit 0118627e4a
2 changed files with 13 additions and 2 deletions

View File

@ -106,6 +106,7 @@ graphite_port: 80
# Graphite prefix / Cloud name used both with graphite and grafana dashboards
graphite_prefix: openstack
# Graphite username and password for login on the dashboard
# credential aren't created when you deploy graphite, use manage.py
graphite_username: root
graphite_password: calvin
@ -114,6 +115,10 @@ graphite_password: calvin
########################################
# Grafana Server IP Address/Port (Can be hosted on the Graphite server)
# you must fill out grafana_host prior to playbook execution
# If you are deploying grafana the username/password combination will be set
# (if you're using the grafana-docker playbook this does not currently work,
# it will deploy with admin/admin). If you're uploading dashboards be sure to
# set the password here to whatever it actually is.
grafana_host:
grafana_port: 3000
grafana_username: admin

View File

@ -21,7 +21,7 @@
- name: Import grafana GPG Key
rpm_key: key=https://grafanarel.s3.amazonaws.com/RPM-GPG-KEY-grafana
state=present
become: true
become: True
- name: Install grafana RPM
yum: name={{ item }} state=present
@ -29,7 +29,7 @@
with_items:
- grafana
- name: Set grafana server port
- name: Set grafana config values
ini_file:
dest=/etc/grafana/grafana.ini
section={{item.section}}
@ -42,6 +42,12 @@
- section: auth.anonymous
option: enabled
value: true
- section: security
option: admin_user
value: "{{grafana_username}}"
- section: security
option: admin_password
value: "{{grafana_password}}"
become: true
### begin firewall ###