From 657585785d902819cb2c89464d8ca11e26167a31 Mon Sep 17 00:00:00 2001 From: Nicolas BOURGES Date: Sun, 23 Jun 2019 22:45:10 +0200 Subject: [PATCH 1/4] Non-Backward-Compatible Change to YAML Renderer --- nut/server.sls | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/nut/server.sls b/nut/server.sls index 89c4ca0..e0918ad 100644 --- a/nut/server.sls +++ b/nut/server.sls @@ -20,7 +20,7 @@ ups_conf: - name: {{ nut.config_dir }}/{{ nut.server.ups.config }} - source: salt://nut/templates/ups-conf.jinja - context: - ups: {{ ups_config }} + ups: {{ ups_config|tojson }} - template: jinja - mode: 640 - user: root @@ -37,7 +37,7 @@ upsd_conf: - name: {{ nut.config_dir }}/{{ nut.server.upsd.config }} - source: salt://nut/templates/upsd-conf.jinja - context: - upsd: {{ upsd_config }} + upsd: {{ upsd_config|tojson }} - template: jinja - mode: 640 - user: root @@ -54,7 +54,7 @@ upsd_users: - name: {{ nut.config_dir }}/{{ nut.server.users.config}} - source: salt://nut/templates/upsd-users.jinja - context: - users: {{ upsd_users }} + users: {{ upsd_users|tojson }} - template: jinja - mode: 640 - user: root From 0275f095cd74ee6fe55ed610d0b1e95c75e8287f Mon Sep 17 00:00:00 2001 From: kartnico Date: Tue, 9 Jul 2019 15:30:01 +0200 Subject: [PATCH 2/4] Update nut/server.sls Co-Authored-By: Imran Iqbal --- nut/server.sls | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nut/server.sls b/nut/server.sls index e0918ad..633e0ed 100644 --- a/nut/server.sls +++ b/nut/server.sls @@ -20,7 +20,7 @@ ups_conf: - name: {{ nut.config_dir }}/{{ nut.server.ups.config }} - source: salt://nut/templates/ups-conf.jinja - context: - ups: {{ ups_config|tojson }} + ups: {{ ups_config | json }} - template: jinja - mode: 640 - user: root From d6f3fc6e248a64f673befb71d2ad3fa39db1d8cf Mon Sep 17 00:00:00 2001 From: kartnico Date: Tue, 9 Jul 2019 15:30:17 +0200 Subject: [PATCH 3/4] Update nut/server.sls Co-Authored-By: Imran Iqbal --- nut/server.sls | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nut/server.sls b/nut/server.sls index 633e0ed..e9617eb 100644 --- a/nut/server.sls +++ b/nut/server.sls @@ -54,7 +54,7 @@ upsd_users: - name: {{ nut.config_dir }}/{{ nut.server.users.config}} - source: salt://nut/templates/upsd-users.jinja - context: - users: {{ upsd_users|tojson }} + users: {{ upsd_users | json }} - template: jinja - mode: 640 - user: root From 990a98fb30adc8bf23eccf6247d08224f80a0356 Mon Sep 17 00:00:00 2001 From: kartnico Date: Tue, 9 Jul 2019 15:30:32 +0200 Subject: [PATCH 4/4] Update nut/server.sls Co-Authored-By: Imran Iqbal --- nut/server.sls | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nut/server.sls b/nut/server.sls index e9617eb..70aca46 100644 --- a/nut/server.sls +++ b/nut/server.sls @@ -37,7 +37,7 @@ upsd_conf: - name: {{ nut.config_dir }}/{{ nut.server.upsd.config }} - source: salt://nut/templates/upsd-conf.jinja - context: - upsd: {{ upsd_config|tojson }} + upsd: {{ upsd_config | json }} - template: jinja - mode: 640 - user: root