diff options
| author | James Kassemi <jkassemi@users.noreply.github.com> | 2016-10-22 10:46:39 -0600 |
|---|---|---|
| committer | René Moser <mail@renemoser.net> | 2016-10-22 18:46:39 +0200 |
| commit | da2d56191313798034b49785f18c0fdc1d573029 (patch) | |
| tree | acc02d4bd39314d4db306cf1ecab955c4e486be8 /cloud/amazon | |
| parent | 0df53bbbed90d81d0e1f51ec93668ea30721aee9 (diff) | |
| download | ansible-modules-extras-da2d56191313798034b49785f18c0fdc1d573029.tar.gz | |
Fix issue with multiple pages of results in ec2_lc_find (#3090)
Diffstat (limited to 'cloud/amazon')
| -rw-r--r-- | cloud/amazon/ec2_lc_find.py | 43 |
1 files changed, 22 insertions, 21 deletions
diff --git a/cloud/amazon/ec2_lc_find.py b/cloud/amazon/ec2_lc_find.py index 32e0d0eb..f18bdfb4 100644 --- a/cloud/amazon/ec2_lc_find.py +++ b/cloud/amazon/ec2_lc_find.py @@ -162,31 +162,32 @@ def find_launch_configs(client, module): } ) + results = [] + for response in response_iterator: response['LaunchConfigurations'] = filter(lambda lc: re.compile(name_regex).match(lc['LaunchConfigurationName']), response['LaunchConfigurations']) - results = [] - for lc in response['LaunchConfigurations']: - data = { - 'name': lc['LaunchConfigurationName'], - 'arn': lc['LaunchConfigurationARN'], - 'created_time': lc['CreatedTime'], - 'user_data': lc['UserData'], - 'instance_type': lc['InstanceType'], - 'image_id': lc['ImageId'], - 'ebs_optimized': lc['EbsOptimized'], - 'instance_monitoring': lc['InstanceMonitoring'], - 'classic_link_vpc_security_groups': lc['ClassicLinkVPCSecurityGroups'], - 'block_device_mappings': lc['BlockDeviceMappings'], - 'keyname': lc['KeyName'], - 'security_groups': lc['SecurityGroups'], - 'kernel_id': lc['KernelId'], - 'ram_disk_id': lc['RamdiskId'], - 'associate_public_address': lc['AssociatePublicIpAddress'], - } - - results.append(data) + for lc in response['LaunchConfigurations']: + data = { + 'name': lc['LaunchConfigurationName'], + 'arn': lc['LaunchConfigurationARN'], + 'created_time': lc['CreatedTime'], + 'user_data': lc['UserData'], + 'instance_type': lc['InstanceType'], + 'image_id': lc['ImageId'], + 'ebs_optimized': lc['EbsOptimized'], + 'instance_monitoring': lc['InstanceMonitoring'], + 'classic_link_vpc_security_groups': lc['ClassicLinkVPCSecurityGroups'], + 'block_device_mappings': lc['BlockDeviceMappings'], + 'keyname': lc['KeyName'], + 'security_groups': lc['SecurityGroups'], + 'kernel_id': lc['KernelId'], + 'ram_disk_id': lc['RamdiskId'], + 'associate_public_address': lc['AssociatePublicIpAddress'], + } + + results.append(data) results.sort(key=lambda e: e['name'], reverse=(sort_order == 'descending')) |