valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-07 08:58:59 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #22856 from jfindlay/route53_timeout

Browse Source 
increase timeout and decrease tries for route53 records
This commit is contained in:
Thomas S Hatch 2015-04-22 10:47:01 -06:00
commit c9ae593461
1 changed files with 61 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

106
salt/modules/boto_route53.py
View File

@ -62,6 +62,14 @@ def __virtual__():
return True
def _is_valid_resource(_type):
if _type in ('A', 'CNAME', 'MX'):
return True
else:
log.error('{0} is an unsupported resource type.'.format(_type))
return False
def get_record(name, zone, record_type, fetch_all=False, region=None, key=None,
keyid=None, profile=None):
'''
@ -81,36 +89,28 @@ def get_record(name, zone, record_type, fetch_all=False, region=None, key=None,
return None
_type = record_type.upper()
ret = odict.OrderedDict()
if not _is_valid_resource(_type):
return None
if _type == 'A':
_record = _zone.get_a(name, fetch_all)
if _record:
ret['name'] = _record.name
ret['value'] = _record.to_print()
ret['record_type'] = _record.type
ret['ttl'] = _record.ttl
elif _type == 'CNAME':
_record = _zone.get_cname(name, fetch_all)
if _record:
ret['name'] = _record.name
ret['value'] = _record.to_print()
ret['record_type'] = _record.type
ret['ttl'] = _record.ttl
elif _type == 'MX':
_record = _zone.get_mx(name, fetch_all)
if _record:
ret['name'] = _record.name
ret['value'] = _record.to_print()
ret['record_type'] = _record.type
ret['ttl'] = _record.ttl
else:
msg = '{0} is an unsupported resource type.'.format(_type)
log.error(msg)
return None
if _record:
ret['name'] = _record.name
ret['value'] = _record.to_print()
ret['record_type'] = _record.type
ret['ttl'] = _record.ttl
return ret
def add_record(name, value, zone, record_type, identifier=None, ttl=None,
region=None, key=None, keyid=None, profile=None):
region=None, key=None, keyid=None, profile=None, sync_wait=False):
'''
Add a record to a zone.
@ -127,24 +127,29 @@ def add_record(name, value, zone, record_type, identifier=None, ttl=None,
log.error(msg)
return False
_type = record_type.upper()
if not _is_valid_resource(_type):
return False
if _type == 'A':
status = _zone.add_a(name, value, ttl, identifier)
return _wait_for_sync(status.id, conn)
elif _type == 'CNAME':
status = _zone.add_cname(name, value, ttl, identifier)
return _wait_for_sync(status.id, conn)
elif _type == 'MX':
status = _zone.add_mx(name, value, ttl, identifier)
return _wait_for_sync(status.id, conn)
if sync_wait:
if _wait_for_sync(status.id, conn):
return True
else:
log.error('Failed to add route53 record {0}.'.format(name))
return False
else:
msg = '{0} is an unsupported resource type.'.format(_type)
log.error(msg)
log.error('Failed to add route53 record {0}.'.format(name))
return False
return True
def update_record(name, value, zone, record_type, identifier=None, ttl=None,
region=None, key=None, keyid=None, profile=None):
region=None, key=None, keyid=None, profile=None, sync_wait=False):
'''
Modify a record in a zone.
@ -161,24 +166,29 @@ def update_record(name, value, zone, record_type, identifier=None, ttl=None,
log.error(msg)
return False
_type = record_type.upper()
if not _is_valid_resource(_type):
return False
if _type == 'A':
status = _zone.update_a(name, value, ttl, identifier)
return _wait_for_sync(status.id, conn)
elif _type == 'CNAME':
status = _zone.update_cname(name, value, ttl, identifier)
return _wait_for_sync(status.id, conn)
elif _type == 'MX':
status = _zone.update_mx(name, value, ttl, identifier)
return _wait_for_sync(status.id, conn)
if sync_wait:
if _wait_for_sync(status.id, conn):
return True
else:
log.error('Failed to update route53 record {0}.'.format(name))
return False
else:
msg = '{0} is an unsupported resource type.'.format(_type)
log.error(msg)
log.error('Failed to update route53 record {0}.'.format(name))
return False
return True
def delete_record(name, zone, record_type, identifier=None, all_records=False,
region=None, key=None, keyid=None, profile=None):
region=None, key=None, keyid=None, profile=None, sync_wait=False):
'''
Modify a record in a zone.
@ -195,32 +205,38 @@ def delete_record(name, zone, record_type, identifier=None, all_records=False,
log.error(msg)
return False
_type = record_type.upper()
if not _is_valid_resource(_type):
return False
if _type == 'A':
status = _zone.delete_a(name, identifier, all_records)
return _wait_for_sync(status.id, conn)
elif _type == 'CNAME':
status = _zone.delete_cname(name, identifier, all_records)
return _wait_for_sync(status.id, conn)
elif _type == 'MX':
status = _zone.delete_mx(name, identifier, all_records)
return _wait_for_sync(status.id, conn)
if sync_wait:
if _wait_for_sync(status.id, conn):
return True
else:
log.error('Failed to delete route53 record {0}.'.format(name))
return False
else:
msg = '{0} is an unsupported resource type.'.format(_type)
log.error(msg)
log.error('Failed to delete route53 record {0}.'.format(name))
return False
return True
def _wait_for_sync(status, conn):
retry = 30
retry = 10
i = 0
while i < retry:
log.info('Getting route53 status (attempt {0})'.format(i + 1))
change = conn.get_change(status)
log.debug(change.GetChangeResponse.ChangeInfo.Status)
if change.GetChangeResponse.ChangeInfo.Status == 'INSYNC':
return True
i = i + 1
time.sleep(10)
time.sleep(20)
log.error('Timed out waiting for Route53 status update.')
return False