Manage minion.d using support metadata
Change-Id: I37f1c26f8125d98bcbe8d5a105dd5abac9224b36
diff --git a/grafana/client/init.sls b/grafana/client/init.sls
index 0573119..f8825bf 100644
--- a/grafana/client/init.sls
+++ b/grafana/client/init.sls
@@ -1,9 +1,6 @@
{%- from "grafana/map.jinja" import client with context %}
{%- if client.get('enabled', False) %}
-include:
- - grafana.client.service
-
{%- for datasource_name, datasource in client.datasource.iteritems() %}
grafana_client_datasource_{{ datasource_name }}:
diff --git a/grafana/client/service.sls b/grafana/client/service.sls
deleted file mode 100644
index 14a3954..0000000
--- a/grafana/client/service.sls
+++ /dev/null
@@ -1,11 +0,0 @@
-{%- from "grafana/map.jinja" import client with context %}
-{%- if client.get('enabled', False) %}
-
-/etc/salt/minion.d/_grafana.conf:
- file.managed:
- - source: salt://grafana/files/_grafana.conf
- - template: jinja
- - user: root
- - group: root
-
-{%- endif %}
diff --git a/grafana/files/_grafana.conf b/grafana/files/_grafana.conf
deleted file mode 100644
index 1d64503..0000000
--- a/grafana/files/_grafana.conf
+++ /dev/null
@@ -1,13 +0,0 @@
-{%- from "grafana/map.jinja" import client with context %}
-
-grafana_version: {{ client.server.get('version', 3) }}
-
-grafana:
- grafana_timeout: 3
- {%- if client.server.token is defined %}
- grafana_token: {{ client.server.token }}
- {%- else %}
- grafana_user: {{ client.server.user }}
- grafana_password: {{ client.server.password }}
- {%- endif %}
- grafana_url: '{{ client.server.get('protocol', 'http') }}://{{ client.server.host }}:{{ client.server.get('port', 80) }}'
diff --git a/grafana/meta/salt.yml b/grafana/meta/salt.yml
index b6ca39f..9e6d273 100644
--- a/grafana/meta/salt.yml
+++ b/grafana/meta/salt.yml
@@ -14,3 +14,19 @@
{{ service_grains|yaml(False)|indent(4) }}
{%- endif %}
{%- endif %}
+
+minion:
+ {%- if pillar.grafana.client is defined %}
+ grafana:
+ {%- from "grafana/map.jinja" import client with context %}
+ grafana_version: {{ client.server.get('version', 3) }}
+ grafana:
+ grafana_timeout: 3
+ {%- if client.server.token is defined %}
+ grafana_token: {{ client.server.token }}
+ {%- else %}
+ grafana_user: {{ client.server.user }}
+ grafana_password: {{ client.server.password }}
+ {%- endif %}
+ grafana_url: '{{ client.server.get('protocol', 'http') }}://{{ client.server.host }}:{{ client.server.get('port', 80) }}'
+ {%- endif %}