From 5e2d4d02769f921f132272ebdaf9cb3d1731087e Mon Sep 17 00:00:00 2001
From: Petr Michalec <epcim@apealive.net>
Date: Tue, 12 Dec 2017 16:43:34 +0100
Subject: [PATCH] minor, tunne compatibility during influxdb.query call

Change-Id: I66219a6c507ca2e22cb909ee6ab3cae013659f36
---
 influxdb/query.sls | 17 +++++++----------
 1 file changed, 7 insertions(+), 10 deletions(-)

diff --git a/influxdb/query.sls b/influxdb/query.sls
index a24e2fa..596befb 100644
--- a/influxdb/query.sls
+++ b/influxdb/query.sls
@@ -18,16 +18,13 @@ influxdb_query_{{ db_name }}_{{ qr_name }}:
     influxdb.query:
       - database: {{ db_name }}
       - query: {{ query }}
-      {%- if grains.saltversion >= "2017.7" %}
-      - client_args:
-        host: {{ mconf.host }}
-        port: {{ mconf.port }}
-        {%- if qr.user is defined OR mconf.password is defined %}
-        user: {{ qr.get('user', mconf.user) }}
-        {%- endif %}
-        {%- if qr.password is defined OR mconf.password is defined %}
-        password: {{ qr.get('password', mconf.password) }}
-        {%- endif %}
+      - host: {{ mconf.host }}
+      - port: {{ mconf.port }}
+      {%- if qr.user is defined OR mconf.password is defined %}
+      - user: {{ qr.get('user', mconf.user) }}
+      {%- endif %}
+      {%- if qr.password is defined OR mconf.password is defined %}
+      - password: {{ qr.get('password', mconf.password) }}
       {%- endif %}
 {%- endfor %}
 {%- endfor %}
-- 
2.32.7