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

extracting list from CustomerGateways to match create (#24897)

Browse source 
* Limiting CustomerGateway to dictionary within list of CustomerGateways

* Copying CustomerGateways[0] to CustomerGateway only if it exsits
This commit is contained in:
Nathaniel McAuliffe 2017-07-27 09:12:20 -04:00 committed by ansibot
parent 72bfb051c3
commit c94c2831da
1 changed files with 8 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
lib/ansible/modules/cloud/amazon/ec2_customer_gateway.py
View file

@ -226,22 +226,20 @@ def main():
name = module.params.get('name') name = module.params.get('name')
existing = gw_mgr.describe_gateways(module.params['ip_address']) existing = gw_mgr.describe_gateways(module.params['ip_address'])
# describe_gateways returns a key of CustomerGateways where as create_gateway returns a
# key of CustomerGateway. For consistency, change it here
existing['CustomerGateway'] = existing['CustomerGateways']
results = dict(changed=False) results = dict(changed=False)
if module.params['state'] == 'present': if module.params['state'] == 'present':
if existing['CustomerGateway']: if existing['CustomerGateways']:
existing['CustomerGateway'] = existing['CustomerGateways'][0]
results['gateway'] = existing results['gateway'] = existing
if existing['CustomerGateway'][0]['Tags']: if existing['CustomerGateway']['Tags']:
tag_array = existing['CustomerGateway'][0]['Tags'] tag_array = existing['CustomerGateway']['Tags']
for key, value in enumerate(tag_array): for key, value in enumerate(tag_array):
if value['Key'] == 'Name': if value['Key'] == 'Name':
current_name = value['Value'] current_name = value['Value']
if current_name != name: if current_name != name:
results['name'] = gw_mgr.tag_cgw_name( results['name'] = gw_mgr.tag_cgw_name(
results['gateway']['CustomerGateway'][0]['CustomerGatewayId'], results['gateway']['CustomerGateway']['CustomerGatewayId'],
module.params['name'], module.params['name'],
) )
results['changed'] = True results['changed'] = True
@ -258,11 +256,12 @@ def main():
results['changed'] = True results['changed'] = True
elif module.params['state'] == 'absent': elif module.params['state'] == 'absent':
if existing['CustomerGateway']: if existing['CustomerGateways']:
existing['CustomerGateway'] = existing['CustomerGateways'][0]
results['gateway'] = existing results['gateway'] = existing
if not module.check_mode: if not module.check_mode:
results['gateway'] = gw_mgr.ensure_cgw_absent( results['gateway'] = gw_mgr.ensure_cgw_absent(
existing['CustomerGateway'][0]['CustomerGatewayId'] existing['CustomerGateway']['CustomerGatewayId']
) )
results['changed'] = True results['changed'] = True