From d99c754f8d8c60eb3130b0e54242e428beaab984 Mon Sep 17 00:00:00 2001
From: Ahmed AbouZaid <ahmed.m@aabouzaid.com>
Date: Tue, 31 Oct 2017 00:54:47 +0100
Subject: [PATCH] serialize for better json format

---
 consul/config.sls | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

diff --git a/consul/config.sls b/consul/config.sls
index 1d079b5..cde3836 100644
--- a/consul/config.sls
+++ b/consul/config.sls
@@ -1,7 +1,7 @@
-{% from slspath+"/map.jinja" import consul with context %}
+{% from slspath + "/map.jinja" import consul with context %}
 
 consul-config:
-  file.managed:
+  file.serialize:
     - name: /etc/consul.d/config.json
     {% if consul.service != False %}
     - watch_in:
@@ -11,8 +11,8 @@ consul-config:
     - group: consul
     - require:
       - user: consul
-    - contents: |
-        {{ consul.config | json }}
+    - formatter: json
+    - dataset: {{ consul.config }}
 
 {% for script in consul.scripts %}
 consul-script-install-{{ loop.index }}:
@@ -26,10 +26,8 @@ consul-script-install-{{ loop.index }}:
 {% endfor %}
 
 consul-script-config:
-  file.managed:
-    - source: salt://{{ slspath }}/files/services.json
+  file.serialize:
     - name: /etc/consul.d/services.json
-    - template: jinja
     {% if consul.service != False %}
     - watch_in:
        - service: consul
@@ -38,6 +36,6 @@ consul-script-config:
     - group: consul
     - require:
       - user: consul
-    - context:
-        register: |
-          {{ consul.register | json }}
+    - formatter: json
+    - dataset:
+        services: {{ consul.register }}