Merge "Fix creation of prometheus user and grant permissions"

ansible/roles/prometheus/tasks/bootstrap.yml

@@ -3,7 +3,7 @@
   become: true
   vars:
     shard_id: "{{ item.key }}"
-    shard_root_user: "{{ mariadb_shard_root_user_prefix }}{{ shard_id | string }}"
+    shard_root_user: "{% if mariadb_loadbalancer == 'haproxy' %}{{ database_user }}{% else %}{{ mariadb_shard_root_user_prefix }}{{ shard_id | string }}{% endif %}"
     shard_host: "{{ mariadb_shards_info.shards[shard_id].hosts[0] }}"
   kolla_toolbox:
     module_name: mysql_user
@@ -22,6 +22,5 @@
     label: "{{ shard_host }}"
   run_once: True
   when:
-    - inventory_hostname == groups['prometheus'][0]
     - enable_prometheus_mysqld_exporter | bool
     - not use_preconfigured_databases | bool