From f84a283251ce216b080ae2ecaf0dee72e3865bea Mon Sep 17 00:00:00 2001
From: Dmitry Kalashnik <dkalashnik@mirantis.com>
Date: Wed, 24 Oct 2018 12:26:56 +0000
Subject: [PATCH] Revert "Add grafana admin password management"

This reverts commit 0bd35ea2f3ee371cdc932a6522ff6a9d4718f8fb.

Closes-Bug: PROD-24331
Change-Id: If1cd867e4253fc21ce2af8af1d638aab02bd6855
---
 grafana/client/init.sls |  3 ---
 grafana/client/user.sls | 18 ------------------
 grafana/map.jinja       |  3 ---
 3 files changed, 24 deletions(-)
 delete mode 100644 grafana/client/user.sls

diff --git a/grafana/client/init.sls b/grafana/client/init.sls
index 645dda0..129d52a 100644
--- a/grafana/client/init.sls
+++ b/grafana/client/init.sls
@@ -111,7 +111,4 @@ grafana_client_dashboard_{{ dashboard_name }}:
 {%- endif %}
 {%- endfor %}
 
-include:
-- grafana.client.user
-
 {%- endif %}
diff --git a/grafana/client/user.sls b/grafana/client/user.sls
deleted file mode 100644
index e45de31..0000000
--- a/grafana/client/user.sls
+++ /dev/null
@@ -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
diff --git a/grafana/map.jinja b/grafana/map.jinja
index d81508a..c7c4bd4 100644
--- a/grafana/map.jinja
+++ b/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: {}