openstack/kayobe
Code Issues Proposed changes

Move setting of Grafana admin username out of Kayobe config

Browse Source
This commit is contained in:
Doug Szumski 2018-02-20 10:05:44 +00:00
parent ca73777e54
commit b651f122db
1 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
ansible/roles/kolla-ansible/templates/globals.yml.j2
View File

@ -279,6 +279,19 @@ tempest_floating_network_name:
bifrost_deploy_image: "{% raw %}{{ docker_registry ~ '/' if docker_registry else '' }}{{ docker_namespace }}/{{ kolla_base_distro }}-source-bifrost-deploy{% endraw %}" bifrost_deploy_image: "{% raw %}{{ docker_registry ~ '/' if docker_registry else '' }}{{ docker_namespace }}/{{ kolla_base_distro }}-source-bifrost-deploy{% endraw %}"
############################################
# Grafana - Data visualisation & Monitoring
############################################
# When using the Monasca fork of Grafana if an OpenStack user with the
# same name as the admin user logs into Grafana it overwrites user data
# in the Grafana database, breaking the local admin account, and
# preventing admin API calls to Grafana. To reduce the chance of this
# happening the local admin account is renamed here.
{% if kolla_enable_grafana and grafana_local_admin_user_name %}
grafana_admin_username: "{{ grafana_local_admin_user_name }}"
{% endif %}
{% if kolla_extra_globals %} {% if kolla_extra_globals %}
####################### #######################
# Extra configuration # Extra configuration