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

Make compatible with python 2.4

Browse source 
Removed one line if else
This commit is contained in:
Manuel Sousa 2015-05-14 16:37:51 +01:00
parent 6354e835d1
commit c7fe644c70
1 changed files with 14 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
messaging/rabbitmq_queue.py
View file

@ -162,7 +162,10 @@ def main():
details = r.text
)
changeRequired = not queueExists if module.params['state']=='present' else queueExists
if module.params['state']=='present':
changeRequired = not queueExists
else:
changeRequired = queueExists
# Check if attributes change on existing queue
if not changeRequired and r.status_code==200 and module.params['state'] == 'present':
@ -170,19 +173,24 @@ def main():
response['durable'] == module.params['durable'] and
response['auto_delete'] == module.params['autoDelete'] and
(
response['arguments']['x-message-ttl'] == module.params['messageTTL'] if 'x-message-ttl' in response['arguments'] else module.params['messageTTL'] is None
( 'x-message-ttl' in response['arguments'] and response['arguments']['x-message-ttl'] == module.params['messageTTL'] ) or
( 'x-message-ttl' not in response['arguments'] and module.params['messageTTL'] is None )
) and
(
response['arguments']['x-expires'] == module.params['autoExpire'] if 'x-expires' in response['arguments'] else module.params['autoExpire'] is None
( 'x-expires' in response['arguments'] and response['arguments']['x-expires'] == module.params['autoExpire'] ) or
( 'x-expires' not in response['arguments'] and module.params['autoExpire'] is None )
) and
(
response['arguments']['x-max-length'] == module.params['maxLength'] if 'x-max-length' in response['arguments'] else module.params['maxLength'] is None
( 'x-max-length' in response['arguments'] and response['arguments']['x-max-length'] == module.params['maxLength'] ) or
( 'x-max-length' not in response['arguments'] and module.params['maxLength'] is None )
) and
(
response['arguments']['x-dead-letter-exchange'] == module.params['deadLetterExchange'] if 'x-dead-letter-exchange' in response['arguments'] else module.params['deadLetterExchange'] is None
( 'x-dead-letter-exchange' in response['arguments'] and response['arguments']['x-dead-letter-exchange'] == module.params['deadLetterExchange'] ) or
( 'x-dead-letter-exchange' not in response['arguments'] and module.params['deadLetterExchange'] is None )
) and
(
response['arguments']['x-dead-letter-routing-key'] == module.params['deadLetterRoutingKey'] if 'x-dead-letter-routing-key' in response['arguments'] else module.params['deadLetterRoutingKey'] is None
( 'x-dead-letter-routing-key' in response['arguments'] and response['arguments']['x-dead-letter-routing-key'] == module.params['deadLetterRoutingKey'] ) or
( 'x-dead-letter-routing-key' not in response['arguments'] and module.params['deadLetterRoutingKey'] is None )
)
):
module.fail_json(