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

Merge pull request #24536 from lyft/route53-more-record-support

Browse Source 
Support all route53 record types
This commit is contained in:
Nicole Thomas 2015-06-09 13:41:58 -06:00
commit a10ccc567a
2 changed files with 21 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
salt/modules/boto_route53.py
View File

@ -83,14 +83,6 @@ def __init__(opts):
__utils__['boto.assign_funcs'](__name__, 'route53')
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_split_zone(zone, _conn, private_zone):
'''
With boto route53, zones can only be matched by name
@ -195,9 +187,6 @@ def get_record(name, zone, record_type, fetch_all=False, region=None, key=None,
_type = record_type.upper()
ret = odict.OrderedDict()
if not _is_valid_resource(_type):
return None
name = _encode_name(name)
if _type == 'A':
_record = _zone.get_a(name, fetch_all)
@ -205,6 +194,8 @@ def get_record(name, zone, record_type, fetch_all=False, region=None, key=None,
_record = _zone.get_cname(name, fetch_all)
elif _type == 'MX':
_record = _zone.get_mx(name, fetch_all)
else:
_record = _zone.find_records(name, _type, all=fetch_all)
if _record:
ret['name'] = _decode_name(_record.name)
@ -237,9 +228,6 @@ def add_record(name, value, zone, record_type, identifier=None, ttl=None,
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, wait_for_sync)
@ -250,7 +238,11 @@ def add_record(name, value, zone, record_type, identifier=None, ttl=None,
status = _zone.add_mx(name, value, ttl, identifier)
return _wait_for_sync(status.id, conn, wait_for_sync)
else:
return True
# add_record requires a ttl value, annoyingly.
if ttl is None:
ttl = 60
status = _zone.add_record(_type, name, value, ttl, identifier)
return _wait_for_sync(status.id, conn, wait_for_sync)
def update_record(name, value, zone, record_type, identifier=None, ttl=None,
@ -275,9 +267,6 @@ def update_record(name, value, zone, record_type, identifier=None, ttl=None,
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, wait_for_sync)
@ -288,7 +277,11 @@ def update_record(name, value, zone, record_type, identifier=None, ttl=None,
status = _zone.update_mx(name, value, ttl, identifier)
return _wait_for_sync(status.id, conn, wait_for_sync)
else:
return True
old_record = _zone.find_records(name, _type)
if not old_record:
return False
status = _zone.update_record(old_record, value, ttl, identifier)
return _wait_for_sync(status.id, conn, wait_for_sync)
def delete_record(name, zone, record_type, identifier=None, all_records=False,
@ -313,9 +306,6 @@ def delete_record(name, zone, record_type, identifier=None, all_records=False,
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, wait_for_sync)
@ -326,7 +316,11 @@ def delete_record(name, zone, record_type, identifier=None, all_records=False,
status = _zone.delete_mx(name, identifier, all_records)
return _wait_for_sync(status.id, conn, wait_for_sync)
else:
return True
old_record = _zone.find_records(name, _type, all=all_records)
if not old_record:
return False
status = _zone.delete_record(old_record)
return _wait_for_sync(status.id, conn, wait_for_sync)
def _wait_for_sync(status, conn, wait_for_sync):

5
salt/states/boto_route53.py
View File

@ -106,7 +106,7 @@ def present(
The zone to create the record in.
record_type
The record type. Currently supported values: A, CNAME, MX
The record type (A, NS, MX, TXT, etc.)
ttl
The time to live for the record.
@ -233,6 +233,9 @@ def absent(
zone
The zone to delete the record from.
record_type
The record type (A, NS, MX, TXT, etc.)
identifier
An identifier to match for deletion.