Merge "Revert "Add grafana admin password management""

grafana/client/init.sls

@@ -111,7 +111,4 @@ grafana_client_dashboard_{{ dashboard_name }}:
 {%- endif %}
 {%- endfor %}
 
-include:
-- grafana.client.user
-
 {%- endif %}

grafana/client/user.sls

@@ -1,18 +0,0 @@
-{%- from "grafana/map.jinja" import client with context %}
-
-grafana_admin_user_{{ client.server.user }}_present:
-  grafana4_user.present:
-    - name: {{ client.server.user }}
-    - password: {{ client.server.password }}
-    - email: "{{ client.server.user }}@localhost"
-    - fullname: {{ client.server.user }}
-    - is_admin: true
-
-grafana_admin_user_{{ client.server.user }}_update_password:
-  module.run:
-  - name: grafana4.update_user_password
-  - userid: {{ client.server.user_id }}
-  - kwargs:
-      password: {{ client.server.password }}
-  - require:
-    - grafana4_user: grafana_admin_user_{{ client.server.user }}_present

grafana/map.jinja

@@ -54,9 +54,6 @@ Debian:
   server:
     host: 127.0.0.1
     port: 3000
-    user: admin
-    password: admin
-    user_id: 1
   remote_data:
     engine: none
   datasource: {}