ansible/community.general
1
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2024-09-14 20:13:21 +02:00
Code Releases Activity

[cloud] Make ec2_vpc_route_table wait for the route to propagate (#35975)

Browse source 
* Stabilize ec2_vpc_route_table

Wait for route table to be present before attempting to use it

Sleep before getting the final state of the route table in case modifications are incomplete

* Conditionally wait if changes were made

* Simplify logic
This commit is contained in:
Sloane Hertel 2018-02-09 16:32:23 -05:00 committed by Ryan Brown
parent 01ba3a4efc
commit fd33dc6cd1
1 changed files with 10 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
lib/ansible/modules/cloud/amazon/ec2_vpc_route_table.py
View file

@ -224,6 +224,7 @@ route_table:
''' '''
import re import re
from time import sleep
from ansible.module_utils.aws.core import AnsibleAWSModule from ansible.module_utils.aws.core import AnsibleAWSModule
from ansible.module_utils.ec2 import ec2_argument_spec, boto3_conn, get_aws_connection_info from ansible.module_utils.ec2 import ec2_argument_spec, boto3_conn, get_aws_connection_info
from ansible.module_utils.ec2 import ansible_dict_to_boto3_filter_list from ansible.module_utils.ec2 import ansible_dict_to_boto3_filter_list
@ -647,6 +648,12 @@ def ensure_route_table_present(connection, module):
if not module.check_mode: if not module.check_mode:
try: try:
route_table = connection.create_route_table(VpcId=vpc_id)['RouteTable'] route_table = connection.create_route_table(VpcId=vpc_id)['RouteTable']
# try to wait for route table to be present before moving on
for attempt in range(5):
if not get_route_table_by_id(connection, module, route_table['RouteTableId']):
sleep(2)
else:
break
except (botocore.exceptions.ClientError, botocore.exceptions.BotoCoreError) as e: except (botocore.exceptions.ClientError, botocore.exceptions.BotoCoreError) as e:
module.fail_json_aws(e, msg="Error creating route table") module.fail_json_aws(e, msg="Error creating route table")
else: else:
@ -678,6 +685,9 @@ def ensure_route_table_present(connection, module):
purge_subnets=purge_subnets) purge_subnets=purge_subnets)
changed = changed or result['changed'] changed = changed or result['changed']
if changed:
# pause to allow route table routes/subnets/associations to be updated before exiting with final state
sleep(5)
module.exit_json(changed=changed, route_table=get_route_table_info(connection, module, route_table)) module.exit_json(changed=changed, route_table=get_route_table_info(connection, module, route_table))