X-Git-Url: https://gerrit.mcp.mirantis.com/gitweb?p=salt-formulas%2Finfluxdb.git;a=blobdiff_plain;f=influxdb%2Fquery.sls;h=596befb735e79983a36729e0abab4a7301bb8a5e;hp=a24e2fa4c190cb97e1290a05aa12ee968700ddc4;hb=refs%2Fchanges%2F99%2F13399%2F1;hpb=5fc2058b928d7c3e62d997a79740ec1e21d58eb9

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 %}