saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-17 10:10:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Pass in client_args when calling influxdb execution module funcs

Browse source 
Fixes #37996

There are several functions in the influxdb_user.py state module
that call functions in the influx.py execution module that
rely on passing **client_args to connect to the database.

This change adds the **client_args option to the influxbd_user state
to pass through these connection options to the execution module calls.
This commit is contained in:
rallytime 2017-01-11 11:25:46 -07:00
parent cfd82d1631
commit 05b0975888
1 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
salt/states/influxdb_user.py
View file

@ -16,12 +16,12 @@ def __virtual__():
return False
def _changes(name, admin):
def _changes(name, admin, **client_args):
'''
Get necessary changes to given user account
'''
existing_user = __salt__['influxdb.user_info'](name)
existing_user = __salt__['influxdb.user_info'](name, **client_args)
changes = {}
if existing_user['admin'] != admin:
@ -68,7 +68,7 @@ def present(name,
ret['result'] = False
return ret
else:
changes = _changes(name, admin)
changes = _changes(name, admin, **client_args)
if changes:
if __opts__['test']:
ret['result'] = None
@ -78,17 +78,17 @@ def present(name,
ret['comment'] += u'{0}: {1}\n'.format(k, v)
return ret
else:
pre = __salt__['influxdb.user_info'](name)
pre = __salt__['influxdb.user_info'](name, **client_args)
for k, v in changes.items():
if k == 'admin':
if v:
__salt__['influxdb.grant_admin_privileges'](name)
__salt__['influxdb.grant_admin_privileges'](name, **client_args)
continue
else:
__salt__['influxdb.revoke_admin_privileges'](name)
__salt__['influxdb.revoke_admin_privileges'](name, **client_args)
continue
post = __salt__['influxdb.user_info'](name)
post = __salt__['influxdb.user_info'](name, **client_args)
for k in post:
if post[k] != pre[k]:
ret['changes'][k] = post[k]