Merge "Support configuring grafana local admin username"

ansible/roles/grafana/defaults/main.yml

@@ -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_tag: "{{ openstack_release }}"
 grafana_image_full: "{{ grafana_image }}:{{ grafana_tag }}"
+grafana_admin_username: "admin"

ansible/roles/grafana/tasks/post_config.yml

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

ansible/roles/grafana/templates/grafana.ini.j2

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