Merge pull request #15 from thouveng/separate-configuration

Move the configuration into a separate state

grafana/client/init.sls

@@ -1,12 +1,8 @@
 {%- 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
+include:
+  - grafana.client.service
 
 {%- for datasource_name, datasource in client.datasource.iteritems() %}
 

grafana/client/service.sls

@@ -0,0 +1,11 @@
+{%- 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 %}