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

Format ELBInfo call (#22383)

Browse source 
Move declaration of AWSRetry of get_all_load_balancers so it isn't redeclared for every page of data.
This commit is contained in:
Ryan Brown 2017-03-13 15:45:18 -04:00 committed by Ryan S. Brown
parent 6d8edfc35f
commit 19511971ee
1 changed files with 4 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
lib/ansible/modules/cloud/amazon/ec2_elb_facts.py
View file

@ -210,9 +210,9 @@ class ElbInformation(object):
def list_elbs(self): def list_elbs(self):
elb_array, token = [], None elb_array, token = [], None
get_elb_with_backoff = AWSRetry.backoff(tries=5, delay=5, backoff=2.0)(self.connection.get_all_load_balancers)
while True: while True:
all_elbs = AWSRetry.backoff(tries=5, delay=5, backoff=2.0)(self.connection.get_all_load_balancers)(marker=token) all_elbs = get_elb_with_backoff(marker=token)
token = all_elbs.next_token token = all_elbs.next_token
if all_elbs: if all_elbs:
@ -244,17 +244,13 @@ def main():
module.fail_json(msg='boto required for this module') module.fail_json(msg='boto required for this module')
try: try:
region, ec2_url, aws_connect_params = get_aws_connection_info(module) region, ec2_url, aws_connect_params = get_aws_connection_info(module)
if not region: if not region:
module.fail_json(msg="region must be specified") module.fail_json(msg="region must be specified")
names = module.params['names'] names = module.params['names']
elb_information = ElbInformation(module, elb_information = ElbInformation(
names, module, names, region, **aws_connect_params)
region,
**aws_connect_params)
ec2_facts_result = dict(changed=False, ec2_facts_result = dict(changed=False,
elbs=elb_information.list_elbs()) elbs=elb_information.list_elbs())