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

Merge pull request #41233 from dnABic/fix/rabbitmq_policy

Browse source 
added parameter apply_to for rabbitmq policy
This commit is contained in:
Nicole Thomas 2017-09-28 15:03:42 -04:00 • committed by GitHub
commit 15b46846fc
2 changed files with 10 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
salt/modules/rabbitmq.py
View file

@ -851,7 +851,7 @@ def list_policies(vhost="/", runas=None):
return ret
def set_policy(vhost, name, pattern, definition, priority=None, runas=None):
def set_policy(vhost, name, pattern, definition, priority=None, apply_to=None, runas=None):
'''
Set a policy based on rabbitmqctl set_policy.
@ -874,6 +874,8 @@ def set_policy(vhost, name, pattern, definition, priority=None, runas=None):
cmd = [RABBITMQCTL, 'set_policy', '-p', vhost]
if priority:
cmd.extend(['--priority', priority])
if apply_to:
cmd.extend(['--apply-to', apply_to])
cmd.extend([name, pattern, definition])
res = __salt__['cmd.run_all'](cmd, runas=runas, python_shell=False)
log.debug('Set policy: {0}'.format(res['stdout']))

7
salt/states/rabbitmq_policy.py
View file

@ -36,6 +36,7 @@ def __virtual__():
def present(name,
pattern,
definition,
apply_to=None,
priority=0,
vhost='/',
runas=None):
@ -52,6 +53,8 @@ def present(name,
A json dict describing the policy
priority
Priority (defaults to 0)
apply_to
Apply policy to 'queues', 'exchanges' or 'all' (defailt to 'all')
vhost
Virtual host to apply to (defaults to '/')
runas
@ -68,6 +71,8 @@ def present(name,
updates.append('Pattern')
if policy.get('definition') != definition:
updates.append('Definition')
if apply_to and (policy.get('apply-to') != apply_to):
updates.append('Applyto')
if int(policy.get('priority')) != priority:
updates.append('Priority')
@ -85,6 +90,7 @@ def present(name,
name,
pattern,
definition,
apply_to,
priority=priority,
runas=runas)
elif updates:
@ -97,6 +103,7 @@ def present(name,
name,
pattern,
definition,
apply_to,
priority=priority,
runas=runas)