Merge pull request #15 from thouveng/separate-configuration
Move the configuration into a separate state
diff --git a/grafana/client.sls b/grafana/client/init.sls
similarity index 94%
rename from grafana/client.sls
rename to grafana/client/init.sls
index 596b2e0..fc89fb4 100644
--- a/grafana/client.sls
+++ b/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() %}
diff --git a/grafana/client/service.sls b/grafana/client/service.sls
new file mode 100644
index 0000000..14a3954
--- /dev/null
+++ b/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 %}