cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

sensu_subscription: Fix return type for 2 cases (#26546)

Browse source 
state=absent would cause errors in 2 cases resulting in the error:
"TypeError: 'bool' object is not iterable"
This commit is contained in:
Anders Ingemann 2017-07-10 21:07:25 +02:00 committed by Adrian Likins
parent 961af6d9e2
commit f018851303
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
lib/ansible/modules/monitoring/sensu_subscription.py
View file

@ -112,7 +112,7 @@ def sensu_subscription(module, path, name, state='present', backup=False):
if 'subscriptions' not in config['client']: if 'subscriptions' not in config['client']:
if state == 'absent': if state == 'absent':
reasons.append('`client.subscriptions\' did not exist and state is `absent\'') reasons.append('`client.subscriptions\' did not exist and state is `absent\'')
return changed return changed, reasons
config['client']['subscriptions'] = [] config['client']['subscriptions'] = []
changed = True changed = True
reasons.append('`client.subscriptions\' did not exist') reasons.append('`client.subscriptions\' did not exist')
@ -120,7 +120,7 @@ def sensu_subscription(module, path, name, state='present', backup=False):
if name not in config['client']['subscriptions']: if name not in config['client']['subscriptions']:
if state == 'absent': if state == 'absent':
reasons.append('channel subscription was absent') reasons.append('channel subscription was absent')
return changed return changed, reasons
config['client']['subscriptions'].append(name) config['client']['subscriptions'].append(name)
changed = True changed = True
reasons.append('channel subscription was absent and state is `present\'') reasons.append('channel subscription was absent and state is `present\'')