From fafb93490cd5841428aef39cbcf6e0f740e1a983 Mon Sep 17 00:00:00 2001 From: James Cammarata Date: Thu, 26 Feb 2015 21:35:10 -0600 Subject: [PATCH] Add private_zone parameter for route53 Fixes #473 --- cloud/amazon/route53.py | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/cloud/amazon/route53.py b/cloud/amazon/route53.py index 7fbe8552f41..38f8dc67c72 100644 --- a/cloud/amazon/route53.py +++ b/cloud/amazon/route53.py @@ -84,6 +84,12 @@ options: required: false default: 500 aliases: [] + private_zone: + description: + - If set to true, the private zone matching the requested name within the domain will be used if there are both public and private zones. The default is to use the public zone. + required: false + default: false + version_added: "1.9" requirements: [ "boto" ] author: Bruce Pennypacker ''' @@ -175,7 +181,8 @@ def main(): type = dict(choices=['A', 'CNAME', 'MX', 'AAAA', 'TXT', 'PTR', 'SRV', 'SPF', 'NS'], required=True), value = dict(required=False), overwrite = dict(required=False, type='bool'), - retry_interval = dict(required=False, default=500) + retry_interval = dict(required=False, default=500), + private_zone = dict(required=False, type='bool', default=False), ) ) module = AnsibleModule(argument_spec=argument_spec) @@ -187,6 +194,7 @@ def main(): type_in = module.params.get('type') value_in = module.params.get('value') retry_interval_in = module.params.get('retry_interval') + private_zone_in = module.params.get('private_zone') ec2_url, aws_access_key, aws_secret_key, region = get_ec2_creds(module) @@ -218,8 +226,11 @@ def main(): zones = {} results = conn.get_all_hosted_zones() for r53zone in results['ListHostedZonesResponse']['HostedZones']: - zone_id = r53zone['Id'].replace('/hostedzone/', '') - zones[r53zone['Name']] = zone_id + # only save this zone id if the private status of the zone matches + # the private_zone_in boolean specified in the params + if module.boolean(r53zone['Config']['PrivateZone']) == private_zone_in: + zone_id = r53zone['Id'].replace('/hostedzone/', '') + zones[r53zone['Name']] = zone_id # Verify that the requested zone is already defined in Route53 if not zone_in in zones: