Add work from 20151127

Nosmoht · Nosmoht · commit d06ff9b41561 · 2015-11-27T08:58:53.000+01:00
diff --git a/README.md b/README.md
@@ -1,20 +1,74 @@
 PowerDNS Ansible library
 ==========
+- [Introduction](#introduction)
 - [Usage](#usage)
+  - [Zones](#zones)
+  - [Records](#records)
 
 # Usage
 
-Ensure zone does exist
+## Zones
+Ensure zone is present
+
 ```yaml
 - powerdns_zone:
-    name: zone.example.com
+    name: zone01.internal.example.com
     nameservers:
     - ns-01.example.com
     - ns-02.example.com
     kind: master
     state: present
     pdns_host: powerdns.example.com
     pdns_port: 8081
-    pdns_prot: http
+    pdns_api_key: topsecret
+```
+
+Ensure zone is absent
+```yaml
+- powerdns_zone:
+    name: zone02.internal.example.com
+    state: absent
+    pdns_host: powerdns.example.com
+    pdns_port: 8081
+    pdns_api_key: topsecret
+```
+
+## Records
+
+Ensure A record
+```yaml
+- powerdns_record:
+    name: host01
+    zone: zone01.internal.example.com
+    type: A
+    content: 192.168.1.234
+    ttl: 1440
+    pdns_host: powerdns.example.com
+    pdns_port: 8081
+    pdns_api_key: topsecret
+```
+
+Ensure AAAA record
+```yaml
+- powerdns_record:
+    name: host01
+    zone: zone01.internal.example.com
+    type: AAAA
+    content: 2001:cdba:0000:0000:0000:0000:3257:9652
+    ttl: 1440
+    pdns_host: powerdns.example.com
+    pdns_port: 8081
+    pdns_api_key: topsecret
+```
+
+Ensure CNAME record
+```yaml
+- powerdns_record:
+    name: database
+    zone: zone01.internal.example.com
+    type: CNAME
+    content: host01.zone01.internal.example.com
+    pdns_host: powerdns.example.com
+    pdns_port: 8081
     pdns_api_key: topsecret
 ```
diff --git a/powerdns_record.py b/powerdns_record.py
@@ -8,20 +8,30 @@
 description:
 - Create, update or delete a PowerDNS records using API
 options:
+  content:
+    description:
+    - Content of the record
+    - Could be an ip address or hostname
   name:
     description:
     - Record name
+    - If name is not an FQDN, zone will be added at the end to create an FQDN
     required: true
   server:
     description:
-    - Server name
+    - Server name.
     required: false
     default: localhost
+  ttl:
+    description:
+    - Record TTL
+    required: false
+    default: 86400
   type:
     description:
     - Record type
     required: false
-    choices: ['A', 'AAAA', 'PTR']
+    choices: ['A', 'AAAA', 'CNAME', 'MX', 'PTR', 'SRV']
     default: None
   zone:
     description:
@@ -39,7 +49,7 @@
     default: 8081
   pdns_prot:
     description:
-    - Protocol used to connect to PowerDNS API
+    - Protocol used by PowerDNS API
     required: false
     default: http
     choices: ['http', 'https']
@@ -115,42 +125,52 @@ def get_zone(self, server, name):
             return None
         return self._handle_request(req)
 
-    def create_record(self, server, zone, name, rtype, content):
+    def get_record(self, server, zone, name):
+        return dict()
+
+    def create_record(self, server, zone, name, rtype, content, disabled, ttl):
         url = self._get_zone_url(server=server, name=zone)
         record_content = list()
-        record_content.append(dict(content=content, disabled='false', name=name, ttl=86400, type=rtype))
+        record_content.append(dict(content=content, disabled=disabled, name=name, ttl=ttl, type=rtype))
         record = dict(name=name, type=rtype, changetype='REPLACE', records=record_content)
         rrsets = list()
         rrsets.append(record)
         data = dict(rrsets=rrsets)
+        #        module.fail_json(msg='{data} {url}'.format(data=json.dumps(data), url=url))
         req = requests.patch(url=url, data=json.dumps(data), headers=self.headers)
         return self._handle_request(req)
 
 
 def ensure(module, pdns_client):
     content = module.params['content']
-    rtype = module.params['type']
-    zone = module.params['zone']
+    disabled = module.params['disabled']
     name = module.params['name']
-    if not zone in name:
-        name = '{name}.{zone}'.format(name=name, zone=zone)
+    rtype = module.params['type']
+    ttl = module.params['ttl']
+    zone_name = module.params['zone']
+
+    if not zone_name in name:
+        name = '{name}.{zone}'.format(name=name, zone=zone_name)
     server = module.params['server']
     state = module.params['state']
 
     try:
-        zone = pdns_client.get_zone(server, zone)
+        zone = pdns_client.get_zone(server, zone_name)
     except PowerDNSError as e:
         module.fail_json(
-            msg='Could not get zone {name}: HTTP {code}: {err}'.format(name=zone, code=e.status_code, err=e.message))
+            msg='Could not get zone {name}: HTTP {code}: {err}'.format(name=zone_name, code=e.status_code,
+                                                                       err=e.message))
 
     if not zone:
-        module.fail_json(msg='Zone not found: {name}'.format(zone=zone))
+        module.fail_json(msg='Zone not found: {name}'.format(zone=zone_name))
 
     records = zone.get('records')
     record = next((item for item in records if item['content'] == content), None)
     if not record and state == 'present':
         try:
-            pdns_client.create_record(server=server, zone=zone, name=name, rtype=rtype, content=content)
+            pdns_client.create_record(server=server, zone=zone_name, name=name, rtype=rtype, content=content, ttl=ttl,
+                                      disabled=disabled)
+            return True, pdns_client.get_record(server=server, zone=zone_name, name=name)
         except PowerDNSError as e:
             module.fail_json(
                 msg='Could not create record {name}: HTTP {code}: {err}'.format(name=name, code=e.status_code,
@@ -159,14 +179,16 @@ def ensure(module, pdns_client):
 
 
 def main():
-    global module
+    #    global module
     module = AnsibleModule(
         argument_spec=dict(
             content=dict(type='str', required=False),
+            disabled=dict(type='bool', default=False),
             name=dict(type='str', required=True),
             server=dict(type='str', default='localhost'),
             state=dict(type='str', default='present', choices=['present', 'absent']),
-            type=dict(type='str', required=False, choices=['A', 'AAAA', 'PTR']),
+            ttl=dict(type='int', default=86400),
+            type=dict(type='str', required=False, choices=['A', 'AAAA', 'CNAME', 'MX', 'PTR', 'SRV']),
             zone=dict(type='str', required=True),
             pdns_host=dict(type='str', default='127.0.0.1'),
             pdns_port=dict(type='int', default=8081),
diff --git a/powerdns_zone.py b/powerdns_zone.py
@@ -46,6 +46,7 @@
 '''
 
 EXAMPLES = '''
+# Ensure a zone is present
 - powerdns_zone:
     name: zone01.internal.example.com
     kind: master
@@ -55,7 +56,14 @@
     state: present
     pdns_host: powerdns.example.cm
     pdns_port: 8080
-    pdns_prot: http
+    pdns_api_key: topsecret
+
+# Ensure a zone is absent
+- powerdns_zone:
+    name: old-zone.internal.example.com
+    state: absent
+    pdns_host: powerdns.example.cm
+    pdns_port: 8080
     pdns_api_key: topsecret
 '''
 
@@ -170,18 +178,18 @@ def ensure(module, pdns_client):
                 module.fail_json(
                     msg='Could not delete zone {name}: HTTP {code}: {err}'.format(name=name, code=e.status_code,
                                                                                   err=e.message))
-        # Compare nameservers
-#        ns_diff = diff(nameservers if nameservers else list(), zone.get('nameservers', list()))
-#        if ns_diff:
-#            try:
-#                if module.check_mode:
-#                    module.exit_json(changed=True, zone=zone)
-#                pdns_client.update_zone(server, zone)
-#                return True, pdns_client.get_zone(name)
-#            except PowerDNSError as e:
-#                module.fail_json(
-#                    msg='Could not update zone {name}: HTTP {code}: {err}'.format(name=name, code=e.status_code,
-#                                                                                  err=e.message))
+                # Compare nameservers
+                #        ns_diff = diff(nameservers if nameservers else list(), zone.get('nameservers', list()))
+                #        if ns_diff:
+                #            try:
+                #                if module.check_mode:
+                #                    module.exit_json(changed=True, zone=zone)
+                #                pdns_client.update_zone(server, zone)
+                #                return True, pdns_client.get_zone(name)
+                #            except PowerDNSError as e:
+                #                module.fail_json(
+                #                    msg='Could not update zone {name}: HTTP {code}: {err}'.format(name=name, code=e.status_code,
+                #                                                                                  err=e.message))
     return False, zone
 
 
