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

Fix hosted_zone_id after rebase.

Browse source
This commit is contained in:
Juho-Mikko Pellinen 2015-07-06 13:02:24 +03:00
parent 71ebe6321b
commit f0ad6c5a1f
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
cloud/amazon/route53.py
View file

@ -250,13 +250,13 @@ try:
except ImportError: except ImportError:
HAS_BOTO = False HAS_BOTO = False
def get_zone_by_name(conn, module, zone_name, want_private): def get_zone_by_name(conn, module, zone_name, want_private, zone_id):
"""Finds a zone by name""" """Finds a zone by name or zone_id"""
for zone in conn.get_zones(): for zone in conn.get_zones():
# only save this zone id if the private status of the zone matches # only save this zone id if the private status of the zone matches
# the private_zone_in boolean specified in the params # the private_zone_in boolean specified in the params
private_zone = module.boolean(zone.config.get('PrivateZone', False)) private_zone = module.boolean(zone.config.get('PrivateZone', False))
if private_zone == want_private and zone.name == zone_name: if private_zone == want_private and ((zone.name == zone_name and zone_id == None) or zone.id.replace('/hostedzone/', '') == zone_id):
return zone return zone
return None return None
@ -280,7 +280,7 @@ def main():
argument_spec.update(dict( argument_spec.update(dict(
command = dict(choices=['get', 'create', 'delete'], required=True), command = dict(choices=['get', 'create', 'delete'], required=True),
zone = dict(required=True), zone = dict(required=True),
hosted_zone_id = dict(required=False), hosted_zone_id = dict(required=False, default=None),
record = dict(required=True), record = dict(required=True),
ttl = dict(required=False, type='int', default=3600), ttl = dict(required=False, type='int', default=3600),
type = dict(choices=['A', 'CNAME', 'MX', 'AAAA', 'TXT', 'PTR', 'SRV', 'SPF', 'NS'], required=True), type = dict(choices=['A', 'CNAME', 'MX', 'AAAA', 'TXT', 'PTR', 'SRV', 'SPF', 'NS'], required=True),
@ -351,7 +351,7 @@ def main():
module.fail_json(msg = e.error_message) module.fail_json(msg = e.error_message)
# Find the named zone ID # Find the named zone ID
zone = get_zone_by_name(conn, module, zone_in, private_zone_in) zone = get_zone_by_name(conn, module, zone_in, private_zone_in, hosted_zone_id_in)
# Verify that the requested zone is already defined in Route53 # Verify that the requested zone is already defined in Route53
if zone is None: if zone is None: