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

Fix some remaining rax asg idempotency checks

Browse source
This commit is contained in:
Matt Martz 2015-06-18 13:12:50 -05:00 committed by Matt Clay
parent 17c185c8d1
commit 158772ffc2
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/cloud/rackspace/rax_scaling_group.py
View file

@ -273,7 +273,7 @@ def rax_asg(module, cooldown=300, disk_config=None, files={}, flavor=None,
disk_config = disk_config or 'AUTO' disk_config = disk_config or 'AUTO'
if ((disk_config or lc.get('disk_config')) and if ((disk_config or lc.get('disk_config')) and
disk_config != lc.get('disk_config')): disk_config != lc.get('disk_config', 'AUTO')):
lc_args['disk_config'] = disk_config lc_args['disk_config'] = disk_config
if (meta or lc.get('meta')) and meta != lc.get('metadata'): if (meta or lc.get('meta')) and meta != lc.get('metadata'):
@ -299,7 +299,7 @@ def rax_asg(module, cooldown=300, disk_config=None, files={}, flavor=None,
if key_name != lc.get('key_name'): if key_name != lc.get('key_name'):
lc_args['key_name'] = key_name lc_args['key_name'] = key_name
if config_drive != lc.get('config_drive'): if config_drive != lc.get('config_drive', False):
lc_args['config_drive'] = config_drive lc_args['config_drive'] = config_drive
if (user_data and if (user_data and