openstack/kolla-ansible
Code Issues Proposed changes

Merge "Support configuring grafana local admin username"

Browse Source
This commit is contained in:
Zuul 2018-02-22 15:20:54 +00:00 committed by Gerrit Code Review
commit 5f28067d36
3 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ansible/roles/grafana/defaults/main.yml
View File

@ -52,3 +52,4 @@ grafana_data_sources:
grafana_image: "{{ docker_registry ~ '/' if docker_registry else '' }}{{ docker_namespace }}/{{ kolla_base_distro }}-{{ kolla_install_type }}-grafana" grafana_image: "{{ docker_registry ~ '/' if docker_registry else '' }}{{ docker_namespace }}/{{ kolla_base_distro }}-{{ kolla_install_type }}-grafana"
grafana_tag: "{{ openstack_release }}" grafana_tag: "{{ openstack_release }}"
grafana_image_full: "{{ grafana_image }}:{{ grafana_tag }}" grafana_image_full: "{{ grafana_image }}:{{ grafana_tag }}"
grafana_admin_username: "admin"

4
ansible/roles/grafana/tasks/post_config.yml
View File

@ -13,7 +13,7 @@
uri: uri:
url: "{{ internal_protocol }}://{{ kolla_internal_vip_address }}:{{ grafana_server_port }}/api/datasources" url: "{{ internal_protocol }}://{{ kolla_internal_vip_address }}:{{ grafana_server_port }}/api/datasources"
method: POST method: POST
user: admin user: "{{ grafana_admin_username }}"
password: "{{ grafana_admin_password }}" password: "{{ grafana_admin_password }}"
body: "{{ item.value.data | to_json }}" body: "{{ item.value.data | to_json }}"
body_format: json body_format: json
@ -31,7 +31,7 @@
uri: uri:
url: "{{ internal_protocol }}://{{ kolla_internal_vip_address }}:{{ grafana_server_port }}/api/user/helpflags/1" url: "{{ internal_protocol }}://{{ kolla_internal_vip_address }}:{{ grafana_server_port }}/api/user/helpflags/1"
method: PUT method: PUT
user: admin user: "{{ grafana_admin_username }}"
password: "{{ grafana_admin_password }}" password: "{{ grafana_admin_password }}"
force_basic_auth: yes force_basic_auth: yes
status_code: 200 status_code: 200

2
ansible/roles/grafana/templates/grafana.ini.j2
View File

@ -35,5 +35,5 @@ reporting_enabled = false
check_for_updates = false check_for_updates = false
[security] [security]
admin_user = admin admin_user = {{ grafana_admin_username }}
admin_password = {{ grafana_admin_password }} admin_password = {{ grafana_admin_password }}