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

[cloud] Add CAA record type to route53 (#29178)

Browse source 
The CAA record type is supported in Amazon Route 53 since Aug 21, 2017. Tested manually.

- https://aws.amazon.com/about-aws/whats-new/2017/08/amazon-route-53-now-supports-caa-records/
- http://docs.aws.amazon.com/Route53/latest/DeveloperGuide/ResourceRecordTypes.html#CAAFormat
- https://tools.ietf.org/html/rfc6844
This commit is contained in:
Johannes Weißl 2017-10-18 04:48:04 +02:00 committed by Will Thames
parent 7623c2fbda
commit 269672faf1
2 changed files with 15 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
lib/ansible/modules/cloud/amazon/route53.py
View file

@ -49,7 +49,7 @@ options:
description: description:
- The type of DNS record to create - The type of DNS record to create
required: true required: true
choices: [ 'A', 'CNAME', 'MX', 'AAAA', 'TXT', 'PTR', 'SRV', 'SPF', 'NS', 'SOA' ] choices: [ 'A', 'CNAME', 'MX', 'AAAA', 'TXT', 'PTR', 'SRV', 'SPF', 'CAA', 'NS', 'SOA' ]
alias: alias:
description: description:
- Indicates if this is an alias record. - Indicates if this is an alias record.
@ -292,6 +292,17 @@ EXAMPLES = '''
weight: 100 weight: 100
health_check: "d994b780-3150-49fd-9205-356abdd42e75" health_check: "d994b780-3150-49fd-9205-356abdd42e75"
# Add a CAA record (RFC 6844):
- route53:
state: present
zone: example.com
record: example.com
type: CAA
value:
- 0 issue "ca.example.net"
- 0 issuewild ";"
- 0 iodef "mailto:security@example.com"
''' '''
import time import time
@ -398,7 +409,7 @@ def main():
hosted_zone_id=dict(required=False, default=None), 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', 'SOA'], required=True), type=dict(choices=['A', 'CNAME', 'MX', 'AAAA', 'TXT', 'PTR', 'SRV', 'SPF', 'CAA', 'NS', 'SOA'], required=True),
alias=dict(required=False, type='bool'), alias=dict(required=False, type='bool'),
alias_hosted_zone_id=dict(required=False), alias_hosted_zone_id=dict(required=False),
alias_evaluate_target_health=dict(required=False, type='bool', default=False), alias_evaluate_target_health=dict(required=False, type='bool', default=False),

4
lib/ansible/modules/cloud/amazon/route53_facts.py
View file

@ -66,7 +66,7 @@ options:
description: description:
- The type of DNS record - The type of DNS record
required: false required: false
choices: [ 'A', 'CNAME', 'MX', 'AAAA', 'TXT', 'PTR', 'SRV', 'SPF', 'NS' ] choices: [ 'A', 'CNAME', 'MX', 'AAAA', 'TXT', 'PTR', 'SRV', 'SPF', 'CAA', 'NS' ]
dns_name: dns_name:
description: description:
- The first name in the lexicographic ordering of domain names that you want - The first name in the lexicographic ordering of domain names that you want
@ -388,7 +388,7 @@ def main():
delegation_set_id=dict(), delegation_set_id=dict(),
start_record_name=dict(), start_record_name=dict(),
type=dict(choices=[ type=dict(choices=[
'A', 'CNAME', 'MX', 'AAAA', 'TXT', 'PTR', 'SRV', 'SPF', 'NS' 'A', 'CNAME', 'MX', 'AAAA', 'TXT', 'PTR', 'SRV', 'SPF', 'CAA', 'NS'
]), ]),
dns_name=dict(), dns_name=dict(),
resource_id=dict(type='list', aliases=['resource_ids']), resource_id=dict(type='list', aliases=['resource_ids']),