inial public version

2018-10-02 10:12:23 +04:00 · 2018-10-02 10:12:23 +04:00 · abbd377dce
commit abbd377dce
parent 1a8b2de4cf
83 changed files with 4080 additions and 0 deletions
--- a/.gitignore
+++ b/.gitignore
@ -0,0 +1,14 @@
+.venv/
+.tmp/
+*.retry
+*.log
+*.pyc
+.pass-*
+vars/envs
+vars/stacks
+*~
+*#
+*.swp
+*-apps.yml
+.pytest_cache/
+vars/conf/
--- a/.gitmodules
+++ b/.gitmodules
@ -0,0 +1,10 @@
+[submodule "role-samba"]
+	path = roles/samba
+	url = https://github.com/altlinuxteam/ansible-samba.git
+	branch = master
+[submodule "roles/remote-desktop"]
+	path = roles/remote-desktop
+	url = https://github.com/altlinuxteam/remote-desktop.git
+[submodule "roles/tftp"]
+	path = roles/tftp
+	url = https://github.com/altlinuxteam/ansible-tftp.git
--- a/ansible.cfg
+++ b/ansible.cfg
@ -0,0 +1,8 @@
+[defaults]
+executable=bash
+ansible_python_interpreter="python"
+filter_plugins=plugins/
+
+[ssh_connection]
+ssh_args = -F .tmp/ssh_config
+pipelining = True
--- a/docs/example_stack.org
+++ b/docs/example_stack.org
@ -0,0 +1,23 @@
+* Generate example environment and stack
+  #+BEGIN_SRC sh
+    ansible-playbook make-example-stack.yml \
+		     -e pve_address=10.64.0.6 \
+		     -e pve_login="example@pve" \
+		     -e pve_password='examplePass123$'\
+		     `# parameters listed below are optional` \
+		     `# default values will be used if ommited` \
+		     -e stack_name="example-samba" \
+		     -e domain_name="domain.alt" \
+		     -e public_bridge="vmbr1" \
+		     -e public_vlan="994" \
+		     -e public_gw="10.64.84.1" \
+		     -e public_dns="8.8.8.8" \
+		     -e private_bridge="vmbr1" \
+		     -e private_vlan="940" \
+		     -e server_template="alt-srv-82-x64-latest" \
+		     -e servers_public_ips="10.64.84.20/24" \
+		     -e servers_private_ips="10.64.6.1/24" \
+		     -e desktop_template="alt-workstation-82-x64-latest" \
+		     -e desktops_public_ips="10.64.84.200/24" \
+		     -e desktops_private_ips="10.64.6.100/24"
+  #+END_SRC
--- a/library/proxmox_kvm.py
+++ b/library/proxmox_kvm.py
--- a/library/proxmox_qemu_agent.py
+++ b/library/proxmox_qemu_agent.py
@ -0,0 +1,157 @@
+#!/usr/bin/python
+# -*- coding: utf-8 -*-
+
+# (c) 2018, Sergey Bubnov (@homgbebebe) <omg at altlinux.org>
+# GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
+
+from __future__ import absolute_import, division, print_function
+__metaclass__ = type
+
+
+ANSIBLE_METADATA = {'metadata_version': '1.1',
+                    'status': ['preview'],
+                    'supported_by': 'community'}
+
+
+DOCUMENTATION = r'''
+---
+module: proxmox_qemu_agent
+short_description: Execute qemu-agent commands on Qemu(KVM) Virtual Machines in Proxmox VE cluster.
+description:
+  - Allows you to execute qemu-agent command on virtual machines
+version_added: "2.6"
+author: "Sergey Bubnov (@homgbebebe) <omg at altlinux.org>"
+options:
+  api_host:
+    description:
+      - Specify the target host of the Proxmox VE cluster.
+    required: true
+  api_user:
+    description:
+      - Specify the user to authenticate with.
+    required: true
+  api_password:
+    description:
+      - Specify the password to authenticate with.
+      - You can use C(PROXMOX_PASSWORD) environment variable.
+  name:
+    description:
+      - Specifies the VM name.
+  validate_certs:
+    description:
+      - If C(no), SSL certificates will not be validated. This should only be used on personally controlled sites using self-signed certificates.
+    type: bool
+    default: 'no'
+  vmid:
+    description:
+      - Specifies the VM ID. Instead use I(name) parameter.
+requirements: [ "proxmoxer", "requests" ]
+'''
+
+EXAMPLES = '''
+# Ping VM via agent interface
+- proxmox_qemu_agent:
+    api_user    : root@pam
+    api_password: secret
+    api_host    : helldorado
+    name        : vm1
+    commnad     : ping
+'''
+
+RETURN = '''
+'''
+
+import os
+import re
+import time
+import traceback
+
+try:
+    from proxmoxer import ProxmoxAPI
+    HAS_PROXMOXER = True
+except ImportError:
+    HAS_PROXMOXER = False
+
+from ansible.module_utils.basic import AnsibleModule
+from ansible.module_utils._text import to_native
+
+
+VZ_TYPE = 'qemu'
+
+
+def get_vmid(proxmox, name):
+    return [vm['vmid'] for vm in proxmox.cluster.resources.get(type='vm') if vm['name'] == name]
+
+
+def get_vm(proxmox, vmid):
+    return [vm for vm in proxmox.cluster.resources.get(type='vm') if vm['vmid'] == int(vmid)]
+
+
+def agent_command(module, proxmox, vm, vmid, command):
+    try:
+        r = getattr(proxmox.nodes(vm[0]['node']), VZ_TYPE)(vmid).agent.post(command=command)
+        module.exit_json(changed=False, results=r['result'])
+    except Exception as e:
+        module.fail_json(msg='qemu-agent request failed withexception: %s' % e)
+
+
+def main():
+    module = AnsibleModule(
+        argument_spec=dict(
+            api_host=dict(required=True),
+            api_user=dict(required=True),
+            api_password=dict(no_log=True),
+            name=dict(type='str'),
+            command=dict(default=None, choices=
+                         ['ping', 'get-time', 'info', 'fsfreeze-status', 'fsfreeze-freeze', 'fsfreeze-thaw', 'fstrim'
+                          ,'network-get-interfaces', 'get-vcpus', 'get-fsinfo', 'get-memory-blocks', 'get-memory-block-info'
+                          ,'suspend-hybrid', 'suspend-ram', 'suspend-disk', 'shutdown'
+                         ]),
+            validate_certs=dict(type='bool', default='no'),
+            vmid=dict(type='int', default=None),
+        ),
+        required_one_of=[('name', 'vmid',)],
+    )
+
+    if not HAS_PROXMOXER:
+        module.fail_json(msg='proxmoxer required for this module')
+
+    api_user = module.params['api_user']
+    api_host = module.params['api_host']
+    api_password = module.params['api_password']
+    command = module.params['command']
+    name = module.params['name']
+    vmid = module.params['vmid']
+    validate_certs = module.params['validate_certs']
+
+    # If password not set get it from PROXMOX_PASSWORD env
+    if not api_password:
+        try:
+            api_password = os.environ['PROXMOX_PASSWORD']
+        except KeyError as e:
+            module.fail_json(msg='You should set api_password param or use PROXMOX_PASSWORD environment variable')
+
+    try:
+        proxmox = ProxmoxAPI(api_host, user=api_user, password=api_password, verify_ssl=validate_certs)
+        global VZ_TYPE
+        global PVE_MAJOR_VERSION
+        PVE_MAJOR_VERSION = 3 if float(proxmox.version.get()['version']) < 4.0 else 4
+    except Exception as e:
+        module.fail_json(msg='authorization on proxmox cluster failed with exception: %s' % e)
+
+    # If vm name is set get the VM id from ProxmoxAPI
+    if not vmid:
+        try:
+            vmid = get_vmid(proxmox, name)[0]
+            if vmid:
+                vm = get_vm(proxmox, vmid)
+                if not vm:
+                    module.fail_json(msg='VM with vmid = %s does not exist in cluster' % vmid)
+        except Exception as e:
+            module.fail_json(msg="VM {} does not exist in cluster.".format(clone))
+
+    agent_command(module, proxmox, vm, vmid, command)
+
+
+if __name__ == '__main__':
+    main()
--- a/make-example-stack.yml
+++ b/make-example-stack.yml
@ -0,0 +1,14 @@
+---
+- name: make example stack
+  hosts: localhost
+  gather_facts: false
+  become: false
+  pre_tasks:
+  - fail: msg="{{ item }} should be set"
+    when: lookup('vars', item) is undefined
+    with_items:
+      - pve_address
+      - pve_login
+      - pve_password
+  roles:
+    - make-example-stack
--- a/plugins/filters.py
+++ b/plugins/filters.py
@ -0,0 +1,118 @@
+#!/usr/bin/env python
+
+from __future__ import (absolute_import, division, print_function)
+__metaclass__ = type
+
+from ansible.errors import AnsibleError
+from ansible.plugins.lookup import LookupBase
+from ansible.utils.listify import listify_lookup_plugin_terms
+import collections
+import re
+import ipaddress
+
+try:
+    import jmespath
+    HAS_LIB = True
+except ImportError:
+    HAS_LIB = False
+
+def dict_merge(dct, merge_dct):
+    """ Recursive dict merge. Inspired by :meth:``dict.update()``, instead of
+    updating only top-level keys, dict_merge recurses down into dicts nested
+    to an arbitrary depth, updating keys. The ``merge_dct`` is merged into
+    ``dct``.
+    :param dct: dict onto which the merge is executed
+    :param merge_dct: dct merged into dct
+    :return: None
+    """
+    for k, v in merge_dct.iteritems():
+        if (k in dct and isinstance(dct[k], dict)
+                and isinstance(merge_dct[k], collections.Mapping)):
+            dict_merge(dct[k], merge_dct[k])
+        else:
+            dct[k] = merge_dct[k]
+
+
+def dict_inject(data, path, obj):
+    p = path.split('/')
+    p.remove('')
+    p.reverse()
+    c = obj
+    for n in p:
+        c = {n: c}
+    z = data.copy()
+    dict_merge(z, c)
+    return z
+
+
+def to_nics_dict(src):
+    nics = {}
+    lo_pat = re.compile("^lo[0-9]{0,2}$")
+    for n in src:
+        if not lo_pat.match(n['name']):
+            addrs = []
+            if "ip-addresses" in n:
+                for a in n['ip-addresses']:
+                    if a['ip-address-type'] != "ipv6":
+                        addrs.append(u'%s/%s' % (a['ip-address'], a['prefix']))
+            nics[n['name']] = {"mac": n['hardware-address'],
+                               "addrs": addrs}
+    return nics
+
+def to_proxmox_net(src):
+    out = {}
+    ks = ['virtio', 'bridge', 'tag']
+    for k,v in src.items():
+        k = k.replace('eth','net')
+        [ v.pop(x, None) for x in set(v.keys()).difference(ks) ]
+        v.pop('ipv4', None) # remove unused key
+        if 'virtio' not in v.items():
+            res = "virtio,"
+        else:
+            res = ""
+        res = res + ','.join(map(lambda x:str('='.join(map(str,x))), v.items()))
+        out[k] = res
+    return out
+
+def gen_nics_addrs(node, num):
+    res = node.copy()
+    for k, v in res['net'].items():
+        for i, a in enumerate(res['net'][k]['ipv4']):
+            interface = ipaddress.ip_interface(a)
+            addr = interface.ip + int(num)
+            cidr = interface.network.prefixlen
+            res['net'][k]['ipv4'][i] = '%s/%s' % (addr, cidr)
+    return res
+
+def list_to_dict(src):
+    res = {}
+    for a in src:
+        k = list(a.keys())[0]
+        res[k] = a[k]
+    return res
+
+def get_steps(node, steps_list):
+    res = []
+    for idx, ss in enumerate(steps_list):
+        for a in ss:
+            if node in a['binds']:
+                res.append("step%s" % idx)
+    return res
+
+def filter_dict(src, pred):
+    p = eval(pred)
+    return { k: v for k, v in src.iteritems() if p(v)}
+
+class FilterModule(object):
+    ''' Query filter '''
+    def filters(self):
+        return {
+            'dict_merge': dict_merge,
+            'dict_inject': dict_inject,
+            'to_nics_dict': to_nics_dict,
+            'to_proxmox_net': to_proxmox_net,
+            'gen_nics_addrs': gen_nics_addrs,
+            'list_to_dict': list_to_dict,
+            'get_steps': get_steps,
+            'filter_dict': filter_dict
+        }
--- a/provision.yml
+++ b/provision.yml
@ -0,0 +1,34 @@
+---
+- name: check input parameters
+  hosts: localhost
+  gather_facts: false
+  tags: always
+  tasks:
+  - fail: msg="env_name should be set"
+    when: env_name is not defined
+  - fail: msg="stack_name should be set"
+    when: stack_name is not defined
+
+- name: provisioning PVE nodes
+  hosts: localhost
+  gather_facts: false
+  roles:
+  - {role: prepare-config, tags: [ ]}
+  - {role: pve, tags: [ ]}
+  - {role: lxc, tags: [ ]}
+  - {role: inventory, bootstrap: yes, tags: [ ]}
+  tags: [ provision ]
+
+- name: prepare nodes
+  hosts: stack
+  gather_facts: false
+  pre_tasks:
+    - meta: end_play
+      when: destroy_all is defined and destroy_all
+    - name: gather facts
+      setup:
+      when: destroy_all is not defined or not destroy_all
+  roles:
+  - {role: prepare-config, tags: [ ]}
+  - {role: common, tags: [ ]}
+  tags: [ prepare ]
--- a/roles/apps/tasks/main.yml
+++ b/roles/apps/tasks/main.yml
@ -0,0 +1,7 @@
+---
+- debug: msg="{{stack}}"
+- name: "install apps"
+  include_tasks: prepare.yml
+  with_items: "{{stack.apps[step]}}"
+  loop_control:
+      loop_var: app
--- a/roles/apps/tasks/prepare.yml
+++ b/roles/apps/tasks/prepare.yml
@ -0,0 +1,9 @@
+---
+- name: "prepare {{ app.name }} environment on {{ inventory_hostname_short }}"
+  set_fact: {"{{ item.key }}":"{{ item.value }}"}
+  with_dict: "{{ app.vars }}"
+  when: app.vars is defined
+
+- name: "apply {{ app.name }} role on {{ inventory_hostname_short }}"
+  include_role: name="{{app.name}}"
+  when: inventory_hostname_short in app.binds
--- a/roles/aptcache/tasks/main.yml
+++ b/roles/aptcache/tasks/main.yml
@ -0,0 +1,2 @@
+---
+- debug: msg="dummy role"
--- a/roles/bind-role/.gitignore
+++ b/roles/bind-role/.gitignore
@ -0,0 +1,19 @@
+# .gitignore
+
+# Hidden Vagrant-directory
+.vagrant
+
+# Backup files (e.g. Vim, Gedit, etc.)
+*~
+
+# Vagrant base boxes (you never know when someone puts one in the repository)
+*.box
+
+# Python artefacts
+.ropeproject
+*.pyc
+
+# Ignore test directory
+tests/
+vagrant-tests/
+docker-tests/
--- a/roles/bind-role/.travis.yml
+++ b/roles/bind-role/.travis.yml
@ -0,0 +1,37 @@
+sudo: required
+
+env:
+  matrix:
+    - DISTRIBUTION: centos
+      VERSION: 7
+    - DISTRIBUTION: ubuntu
+      VERSION: 16.04
+
+services:
+  - docker
+
+before_install:
+    # Install latest Git
+  - sudo apt-get update
+  - sudo apt-get install --only-upgrade git
+    # Allow fetching other branches than master
+  - git config remote.origin.fetch +refs/heads/*:refs/remotes/origin/*
+    # Fetch the branch with test code
+  - git fetch origin docker-tests
+  - git worktree add tests origin/docker-tests
+
+script:
+  # Running the test script the first time will set up the master DNS server
+  # with IP 172.17.0.2. Running it the second time sets up the slave DNS
+  # server with IP 172.17.0.3.
+  - ./tests/docker-tests.sh
+  - ./tests/docker-tests.sh
+
+  # Run functional tests on both master and slave server
+  - SUT_IP=172.17.0.2 ./tests/functional-tests.sh
+  # Ensure the slave gets the chance to receive zone updates from the master
+  - sleep 6s
+  - SUT_IP=172.17.0.3 ./tests/functional-tests.sh
+
+notifications:
+  webhooks: https://galaxy.ansible.com/api/v1/notifications/
--- a/roles/bind-role/CHANGELOG.md
+++ b/roles/bind-role/CHANGELOG.md
@ -0,0 +1,175 @@
+# Change log
+
+This file contains al notable changes to the bind Ansible role.
+
+This file adheres to the guidelines of [http://keepachangelog.com/](http://keepachangelog.com/). Versioning follows [Semantic Versioning](http://semver.org/).  "GH-X" refers to the X'th issue/pull request on the Github project.
+
+## 3.9.0 - 2017-11-21
+
+### Added
+
+- (GH-35) Role variable `bind_check_names`, which adds support for check-names (e.g. `check-names master ignore;`)
+- (GH-36) Role variable `bind_allow_recursion`, which adds support for allow-recursion (credit: [Loic Dachary](https://github.com/dachary))
+- (GH-39) Role variable `bind_zone_delegate`, which adds support for zone delegation / NS records (credit: [Loic Dachary](https://github.com/dachary))
+- (GH-40) Role variables `bind_dnssec_enable` and `bind_dnssec_validation`, which makes DNSSEC validation configurable (credit: [Guillaume Darmont](https://github.com/gdarmont)).
+
+### Changed
+
+- (GH-38) Only append domain to MX if it does not end with a dot (credit: [Loic Dachary](https://github.com/dachary))
+
+## 3.8.0 - 2017-07-12
+
+This release adds support for multiple TXT entries and fixes some bugs.
+
+### Added
+
+- (GH-31) Support for multiple TXT entries for the same name (credit: [Rafael Bodill](https://github.com/rafi))
+
+### Changed
+
+- (GH-31) Fixed ipv6 reverse zone hash calculation for complete idempotency (credit: [Stuart Knight](https://github.com/blofeldthefish))
+- (GH-32, GH-33) Fix for bug where CNAMEs and Multi-IP entries weren't working (credit: [Greg Cockburn](https://github.com/gergnz))
+
+## 3.7.1 - 2017-07-03
+
+### Changed
+
+- (GH-29) Zone files are fully idempotent, so are only changed when actual content changes (credit: [@Stuart Knight](https://github.com/blofeldthefish))
+
+## 3.7.0 - 2017-06-01
+
+### Added
+
+- (GH-10) Implement reverse IPv6 lookups
+- (GH-28) Add option `bind_forwarders` and `bind_forward_only`, which allows BIND to be set up as a caching name server.
+
+## 3.6.1 - 2017-06-01
+
+### Changed
+
+- Fixed a bug with generating the reverse zone names.
+
+## 3.6.0 - 2017-06-01
+
+### Changed
+
+- (GH-25) Allow slave log file to be set with variable `bind_log` instead of a hard coded value (credit @kartone).
+- The alignment of columns in the reverse zone file are improved
+
+### Added
+
+- (GH-22, 23) Documentation improvements
+- (GH-27) Allow dynamic updates (credit: @bverschueren)
+
+### Removed
+
+- The custom filter plugins were removed. The functionality has since been added to Ansible's built-in filter plugins. This does require `python-netaddr` to be installed on the management node.
+
+## 3.5.2 - 2016-09-29
+
+### Changed
+
+* The call to `named-checkconf` was fixed. It had the full path to the binary, which is not the same on all distributions. (GH-20, credit @peterjanes)
+
+## 3.5.1 - 2016-09-22
+
+### Changed
+
+* The check for master/slave server is improved (GH-19, credit @josetaas)
+
+## 3.5.0 - 2016-07-28
+
+### Added
+
+* Introduced role variable `bind_log`, the path to the log file.
+* Introduced role variable `bind_zone_also_notify`, a list of servers that will receive a notification when the master zone file is reloaded (GH-18, credit: Joanna Delaporte)
+* Reverse zone files now handle the case with only a single host (GH-18, credit: Joanna Delaporte)
+
+## 3.4.0 - 2016-05-26
+
+### Added
+
+* (GH-16) Support for service record (SRV) lookups
+* Support for text record (TXT) lookups
+
+### Changed
+
+* Fixed Ansible 2.0 deprecation warnings
+* Generating a serial is no longer considered a change
+* Ensured that all role variables have a default value, e.g. empty list instead of undefined. This simplifies template logic (no `if defined` tests), and is considered [deprecated in playbooks within a *with_* loop](https://docs.ansible.com/ansible/porting_guide_2.0.html#deprecated).
+
+## 3.3.1 - 2016-04-08
+
+### Removed
+
+* The `version:` field in `meta/main.yml`. This an unofficial field that is used by a third-party tool for managing role dependencies (librarian-ansible). Custom meta fields are no longer accepted in Ansible 2.0. See [ansible/ansible#13496](https://github.com/ansible/ansible/issues/13496) for more info. Unfortunately, this will break support for librarian-ansible. As a workaround, until this issue is resolved upstream, use version 3.3.0 of this role.
+
+## 3.3.0 - 2016-04-08
+
+### Added
+
+* Added role variable `bind_other_name_servers` for adding NS records for DNS servers outside of the domain. (GH-12)
+* Re-added `bind_recursion`, as it is needed in some cases. (GH-14)
+
+### Removed
+
+## 3.2.1 - 2015-12-15
+
+### Added
+
+* The domain name can now also point to an IP address, enabling e.g. "http://example.com/" (GH-11)
+
+## 3.2.0 - 2015-12-07
+
+### Added
+
+* Add support for multiple IP addresses per host (GH-9)
+* Allow setting `rrset-order` (for DNS round robin)
+* Add support for (multiple) IPv6 (AAAA) records (GH-2). For now, only forward lookups are supported.
+
+### Changed
+
+* Test code is put into a separate branch. This means that test code is no longer included when installing the role from Ansible Galaxy.
+
+## 3.1.0 - 2015-12-04
+
+### Added
+
+* Add support for zone transfers (GH-8)
+* Check whether `bind_zone_master_server_ip` was set (GH-7)
+
+### Removed
+
+* Role variable `bind_recursion` was removed. This role is explicitly only suitable for an authoritative DNS server, and in this case, recursion should be off.
+
+## 3.0.0 - 2015-06-14
+
+### Added
+
+* You can now set up a master and slave DNS server.
+* The variable `bind_zone_master_server_ip` was added. This is a **required** variable, which makes this release not backwards compatible.
+* Automated acceptance tests for the test playbook
+
+## 2.0.0 - 2015-06-10
+
+### Added
+
+* Added EL6 to supported platforms. Thanks to @rilindo for verifying this.
+
+### Changed
+
+* Recursion is turned off by default, which fits an authoritative name server. This change is not backwards compatible, as the behaviour of BIND is different from before when you do not set the variable `bind_recursion` explicitly.
+
+### Removed
+
+* Firewall settings. This should not be a concern of this role. Configuring the firewall is functionality offered by other roles (e.g. [bertvv.bind](https://github.com/bertvv/ansible-role-el7))
+
+## 1.0.0 - 2015-04-22
+
+First release!
+
+### Added
+
+- Functionality for master DNS server
+- Multiple reverse lookup zones
+
--- a/roles/bind-role/LICENSE.md
+++ b/roles/bind-role/LICENSE.md
@ -0,0 +1,13 @@
+# BSD License
+
+Copyright (c) 2014, Bert Van Vreckem, (bert.vanvreckem@gmail.com)
+
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
+
+1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
+
+2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
--- a/roles/bind-role/README.md
+++ b/roles/bind-role/README.md
@ -0,0 +1,315 @@
+# Ansible role `bind`
+
+[![Build Status](https://travis-ci.org/bertvv/ansible-role-bind.svg?branch=master)](https://travis-ci.org/bertvv/ansible-role-bind)
+
+An Ansible role for setting up BIND ISC as an authoritative DNS server for a single domain on EL7 or Ubuntu Server. Specifically, the responsibilities of this role are to:
+
+- install BIND
+- set up the main configuration file
+    - master server
+    - slave server
+- set up forward and reverse lookup zone files
+
+This role supports multiple reverse zones. IPv6 lookups are also supported, both forward and reverse.
+
+Configuring the firewall is not a concern of this role, so you should do this using another role (e.g. [bertvv.rh-base](https://galaxy.ansible.com/bertvv/rh-base/)).
+
+If you like/use this role, please consider giving it a star. Thanks!
+
+## Requirements
+
+- **The package `python-ipaddr` should be installed on the management node** (since v3.7.0)
+
+## Role Variables
+
+Variables are not required, unless specified.
+
+| Variable                       | Default                          | Comments (type)                                                                                                          |
+| :---                           | :---                             | :---                                                                                                                     |
+| `bind_acls`                    | `[]`                             | A list of ACL definitions, which are dicts with fields `name` and `match_list`. See below for an example.           |
+| `bind_allow_query`             | `['localhost']`                  | A list of hosts that are allowed to query this DNS server. Set to ['any'] to allow all hosts                             |
+| `bind_allow_update`            | `['none']`                       | A list of hosts that are allowed to dynamically update this DNS server.                                                  |
+| `bind_check_names`             | `[]`                             | Check host names for compliance with RFC 952 and RFC 1123 and take the defined actioni (e.g. `warn`, `ignore`, `fail`). |
+| `bind_forwarders`              | `[]`                             | A list of name servers to forward DNS requests to.                                                                       |
+| `bind_forward_only`            | `false`                          | If `true`, BIND is set up as a caching name server                                                                       |
+| `bind_listen_ipv4`             | `['127.0.0.1']`                  | A list of the IPv4 address of the network interface(s) to listen on. Set to ['any'] to listen on all interfaces.        |
+| `bind_listen_ipv6`             | `['::1']`                        | A list of the IPv6 address of the network interface(s) to listen on                                                      |
+| `bind_log`                     | `data/named.run`                 | Path to the log file                                                                                                     |
+| `bind_other_name_servers`      | `[]`                             | A list of nameservers outside of the domain. For each one, an NS record will be created.                                 |
+| `bind_recursion`               | `false`                          | Determines whether requests for which the DNS server is not authoritative should be forwarded†.                          |
+| `bind_allow_recursion`         | `['any']`                        | Similar to bind_allow_query, this option applies to recursive queries.                                                   |
+| `bind_rrset_order`             | `random`                         | Defines order for DNS round robin (either `random` or `cyclic`)                                                          |
+| `bind_dnssec_enable`           | `true`                           | Is DNSSEC enabled                                                                                                        |
+| `bind_dnssec_validation`       | `true`                           | Is DNSSEC validation enabled                                                                                             |
+| `bind_zone_also_notify`        | -                                | A list of servers that will receive a notification when the master zone file is reloaded.                                |
+| `bind_zone_hostmaster_email`   | `hostmaster`                     | The e-mail address of the system administrator                                                                           |
+| `bind_zone_hosts`              | `[]`                             | Host definitions. See below this table for examples.                                                                     |
+| `bind_zone_delegate`           | `[]`                             | Zone delegation. See below this table for examples.                                                                      |
+| `bind_zone_mail_servers`       | `[{name: mail, preference: 10}]` | A list of dicts (with fields `name` and `preference`) specifying the mail servers for this domain.                       |
+| `bind_zone_master_server_ip`   | -                                | **(Required)** The IP address of the master DNS server.                                                                  |
+| `bind_zone_minimum_ttl`        | `1D`                             | Minimum TTL field in the SOA record.                                                                                     |
+| `bind_zone_name_servers`       | `[ansible_hostname]`             | A list of the DNS servers for this domain.                                                                               |
+| `bind_zone_name`               | `example.com`                    | The domain name                                                                                                          |
+| `bind_zone_networks`           | `['10.0.2']`                     | A list of the networks that are part of the domain                                                                       |
+| `bind_zone_ipv6_networks`      | `[]`                             | A list of the IPv6 networks that are part of the domain, in CIDR notation (e.g. 2001:db8::/48)                           |
+| `bind_zone_other_name_servers` | `[]`                             | A list of the DNS servers outside of this domain.                                                                        |
+| `bind_zone_services`           | `[]`                             | A list of services to be advertized by SRV records                                                                       |
+| `bind_zone_text`               | `[]`                             | A list of dicts with fields `name` and `text`, specifying TXT records. `text` can be a list or string.            |
+| `bind_zone_time_to_expire`     | `1W`                             | Time to expire field in the SOA record.                                                                                  |
+| `bind_zone_time_to_refresh`    | `1D`                             | Time to refresh field in the SOA record.                                                                                 |
+| `bind_zone_time_to_retry`      | `1H`                             | Time to retry field in the SOA record.                                                                                   |
+| `bind_zone_ttl`                | `1W`                             | Time to Live field in the SOA record.                                                                                    |
+
+† Best practice for an authoritative name server is to leave recursion turned off. However, [for some cases](http://www.zytrax.com/books/dns/ch7/queries.html#allow-query-cache) it may be necessary to have recursion turned on.
+
+### Minimal variables for a working zone
+
+Even thoug only variable `bind_zone_master_server_ip` is required for the role to run without errors, this is not sufficient to get a working zone. In order to set up an authoritative name server that is available to clients, you should also at least define the following variables:
+
+| Variable                 | Master | Slave |
+| :---                     | :---:  | :---: |
+| `bind_zone_name`         | V      | V     |
+| `bind_zone_networks`     | V      | V     |
+| `bind_zone_name_servers` | V      | V     |
+| `bind_zone_hosts`        | V      | --    |
+| `bind_listen_ipv4`       | V      | V     |
+| `bind_allow_query`       | V      | V     |
+
+### Host definitions
+
+Host names that this DNS server should resolve can be specified with the variable `bind_zone_hosts` as a list of dicts with fields `name`, `ip` and `aliases`, e.g.:
+
+```Yaml
+bind_zone_hosts:
+  - name: pub01
+    ip: 192.0.2.1
+    ipv6: 2001:db8::1
+    aliases:
+      - ns
+  - name: '@'
+    ip:
+      - 192.0.2.2
+      - 192.0.2.3
+    ipv6:
+      - 2001:db8::2
+      - 2001:db8::3
+    aliases:
+      - www
+  - name: priv01
+    ip: 10.0.0.1
+```
+
+To allow to surf to http://example.com/, set the host name of your web server to `'@'` (must be quoted!). In BIND syntax, `@` indicates the domain name itself.
+
+IP addresses (both IPv4 and IPv6) can be specified as a string or as a list. This results in a single or multiple A/AAAA records for the host, respectively. This enables [DNS round robin](http://www.zytrax.com/books/dns/ch9/rr.html), a simple load balancing technique. The order in which the IP addresses are returned can be configured with role variable `bind_rrset_order`.
+
+As you can see, not all hosts are in the same network. This is perfectly acceptable, and supported by this role. All networks should be specified in `bind_zone_networks`, though, or the host will not get a PTR record for reverse lookup:
+
+```Yaml
+bind_zone_networks:
+  - '192.0.2'
+  - '10'
+  - '172.16'
+```
+
+Remark that only the network part should be specified here! When specifying a class B IP address (e.g. "172.16") in a variable file, it must be quoted. Otherwise, the Yaml parser will interpret it as a float.
+
+Based on the idea and examples detailed at <https://linuxmonk.ch/wordpress/index.php/2016/managing-dns-zones-with-ansible/> for the gdnsd package, the zonefiles are fully idempotent, and thus only get updated if "real" content changes.
+
+### Zone delgation
+
+To delegate a zone to a DNS, it is enough to create a `NS` record with:
+
+```Yaml
+bind_zone_delegate:
+  - zone: foo
+    dns: 192.0.2.1
+```
+
+which is the equivalent of:
+
+```
+foo IN NS 192.0.2.1
+```
+
+
+### Service records
+
+Service (SRV) records can be added with the variable `bind_zone_services`, e.g.:
+
+```Yaml
+bind_zone_services:
+  - name: _ldap._tcp
+    weight: 100
+    port: 88
+    target: dc001
+```
+
+This is a list of dicts with mandatory fields `name` (service name), `target` (host providing the service), `port` (TCP/UDP port of the service) and optional fields `priority` (default = 0) and `weight` (default = 0).
+
+### ACLs
+
+ACLs can be defined like this:
+
+```Yaml
+bind_acls:
+  - name: acl1
+    match_list:
+      - 192.0.2.0/24
+      - 10.0.0.0/8
+```
+
+The names of the ACLs will be added to the `allow-transfer` clause in global options.
+
+## Dependencies
+
+No dependencies. If you want to configure the firewall, do this through another role (e.g. [bertvv.rh-base](https://galaxy.ansible.com/bertvv/rh-base)).
+
+## Example Playbook
+
+See the test playbook [test.yml](https://github.com/bertvv/ansible-role-bind/blob/docker-tests/test.yml) for an elaborate example that shows all features.
+
+## Testing
+
+There are two test environments for this role, one based on Vagrant, the other on Docker. The latter powers the Travis-CI tests. The tests are kept in a separate (orphan) branch so as not to clutter the actual code of the role. [git-worktree(1)](https://git-scm.com/docs/git-worktree) is used to include the test code into the working directory. Remark that this requires at least Git v2.5.0.
+
+### Running Docker tests
+
+1. Fetch the test branch: `git fetch origin docker-tests`
+2. Create a Git worktree for the test code: `git worktree add docker-tests docker-tests`. This will create a directory `docker-tests/`
+
+The script `docker-tests.sh` will create a Docker container, and apply this role from a playbook `test.yml`. The Docker images are configured for testing Ansible roles and are published at <https://hub.docker.com/r/bertvv/ansible-testing/>. There are images available for several distributions and versions. The distribution and version should be specified outside the script using environment variables:
+
+```
+DISTRIBUTION=centos VERSION=7 ./tests/docker-tests.sh
+```
+
+The specific combinations of distributions and versions that are supported by this role are specified in `.travis.yml`.
+
+The first time the test script is run, a container will be created that is assigned the IP address 172.17.0.2. This will be the master DNS-server. The server is still running after the script finishes and can be queried from the command line, e.g.:
+
+```
+$ dig @172.17.0.2 www.acme-inc.com +short
+srv001.acme-inc.com.
+172.17.1.1
+```
+
+If you run the script again, a new container is launched with IP address 172.17.0.3 that will be set up as a slave DNS-server. After a few seconds, it will have received updates from the master server and can be queried as well.
+
+```
+$ dig @172.17.0.3 www.acme-inc.com +short
+srv001.acme-inc.com.
+172.17.1.1
+```
+
+The script `tests/functional-tests.sh` will run a [BATS](https://github.com/sstephenson/bats) test suite, `dns.bats` that performs a number of different queries. Specify the server IP address as the environment variable `${SUT_IP}` (short for System Under Test).
+
+```
+$ SUT_IP=172.17.0.2 ./tests/functional-tests.sh
+### Using BATS executable at: /usr/local/bin/bats
+### Running test /home/bert/CfgMgmt/roles/bind/tests/dns.bats
+ ✓ Forward lookups public servers
+ ✓ Reverse lookups
+ ✓ Alias lookups public servers
+ ✓ IPv6 forward lookups
+ ✓ NS record lookup
+ ✓ Mail server lookup
+ ✓ Service record lookup
+ ✓ TXT record lookup
+
+8 tests, 0 failures
+$ SUT_IP=172.17.0.3 ./tests/functional-tests.sh
+[...]
+```
+
+### Running Vagrant tests
+
+1. Fetch the tests branch: `git fetch origin vagrant-tests`
+2. Create a Git worktree for the test code: `git worktree add vagrant-tests vagrant-tests`. This will create a directory `vagrant-tests/`.
+3. `cd vagrant-tests/`
+4. `vagrant up` will then create two VMs and apply a test playbook (`test.yml`).
+
+The command `vagrant up` results in a setup with *two* DNS servers, a master and a slave, set up according to playbook `test.yml`.
+
+| **Hostname**     | **ip**        |
+| :---             | :---          |
+| `testbindmaster` | 192.168.56.53 |
+| `testbindslave`  | 192.168.56.54 |
+
+IP addresses are in the subnet of the default VirtualBox Host Only network interface (192.168.56.0/24). You should be able to query the servers from your host system. For example, to verify if the slave is updated correctly, you can do the following:
+
+```ShellSession
+$ dig @192.168.56.54 ns1.example.com +short
+testbindmaster.example.com.
+192.168.56.53
+$ dig @192.168.56.54 example.com www.example.com +short
+web.example.com.
+192.168.56.20
+192.168.56.21
+$ dig @192.168.56.54 MX example.com +short
+10 mail.example.com.
+
+```
+
+An automated acceptance test written in [BATS](https://github.com/sstephenson/bats.git) is provided that checks most settings specified in `tests/test.yml`. You can run it by executing the shell script `tests/runtests.sh`. The script can be run on either your host system (assuming you have a Bash shell), or one of the VMs. The script will download BATS if needed and run the test script `tests/dns.bats` on both the master and the slave DNS server.
+
+```ShellSession
+$ cd vagrant-tests
+$ vagrant up
+[...]
+$ ./runtests.sh
+Testing 192.168.56.53
+✓ The `dig` command should be installed
+✓ It should return the NS record(s)
+✓ It should be able to resolve host names
+✓ It should be able to resolve IPv6 addresses
+✓ It should be able to do reverse lookups
+✓ It should be able to resolve aliases
+✓ It should return the MX record(s)
+
+6 tests, 0 failures
+Testing 192.168.56.54
+✓ The `dig` command should be installed
+✓ It should return the NS record(s)
+✓ It should be able to resolve host names
+✓ It should be able to resolve IPv6 addresses
+✓ It should be able to do reverse lookups
+✓ It should be able to resolve aliases
+✓ It should return the MX record(s)
+
+6 tests, 0 failures
+```
+
+Running from the VM:
+
+```ShellSession
+$ vagrant ssh testbindmaster
+Last login: Sun Jun 14 18:52:35 2015 from 10.0.2.2
+Welcome to your Packer-built virtual machine.
+[vagrant@testbindmaster ~]$ /vagrant/runtests.sh
+Testing 192.168.56.53
+ ✓ The `dig` command should be installed
+[...]
+```
+
+## License
+
+BSD
+
+## Contributors
+
+Issues, feature requests, ideas, suggestions, etc. are appreciated and can be posted in the Issues section.
+
+Pull requests are also very welcome. Please create a topic branch for your proposed changes. If you don't, this will create conflicts in your fork after the merge. Don't hesitate to add yourself to the contributor list below in your PR!
+
+- [Bert Van Vreckem](https://github.com/bertvv/) (Maintainer)
+- [B. Verschueren](https://github.com/bverschueren)
+- [Greg Cockburn](https://github.com/gergnz)
+- [Guillaume Darmont](https://github.com/gdarmont)
+- [Joanna Delaporte](https://github.com/jdelaporte)
+- [Jose Taas](https://github.com/josetaas)
+- [Peter Janes](https://github.com/peterjanes)
+- [Mario Ciccarelli](https://github.com/kartone)
+- [Rafael Bodill](https://github.com/rafi)
+- [Stuart Knight](https://github.com/blofeldthefish)
+- [Loic Dachary](http://dachary.org)
--- a/roles/bind-role/defaults/main.yml
+++ b/roles/bind-role/defaults/main.yml
@ -0,0 +1,68 @@
+# roles/bind/defaults/main.yml
+---
+
+bind_log: "data/named.run"
+
+bind_zone_name: "example.com"
+bind_zone_networks:
+  - "10.0.2"
+bind_zone_ipv6_networks: []
+
+# List of servers to be notified when the master zone is reloaded.
+bind_zone_also_notify: []
+
+# List of acls.
+bind_acls: []
+
+# List of IPv4 address of the network interface(s) to listen on. Set to "any"
+# to listen on all interfaces
+bind_listen_ipv4:
+  - "127.0.0.1"
+
+# List of IPv6 address of the network interface(s) to listen on.
+bind_listen_ipv6:
+  - "::1"
+
+# List of hosts that are allowed to query this DNS server.
+bind_allow_query:
+  - "localhost"
+
+# List of hosts that are allowed to dynamically update this DNS server
+bind_allow_update:
+  - "none"
+
+# Determines whether recursion should be allowed. Typically, an authoritative
+# name server should have recursion turned OFF.
+bind_recursion: false
+bind_allow_recursion:
+  - "any"
+
+# Allows BIND to be set up as a caching name server
+bind_forward_only: false
+
+# List of name servers to forward DNS requests to.
+bind_forwarders: []
+
+# DNS round robin order (random or cyclic)
+bind_rrset_order: "random"
+
+# DNSSEC configuration
+bind_dnssec_enable: true
+bind_dnssec_validation: true
+
+# SOA information
+bind_zone_hostmaster_email: "hostmaster"
+bind_zone_ttl: "1W"
+bind_zone_time_to_refresh: "1D"
+bind_zone_time_to_retry: "1H"
+bind_zone_time_to_expire: "1W"
+bind_zone_minimum_ttl: "1D"
+
+# Zone Resource Records
+bind_other_name_servers: []
+bind_zone_hosts: []
+bind_zone_delegate: []
+bind_zone_mail_servers: []
+bind_zone_name_servers: []
+bind_zone_services: []
+bind_zone_text: []
--- a/roles/bind-role/handlers/main.yml
+++ b/roles/bind-role/handlers/main.yml
@ -0,0 +1,7 @@
+# roles/bind/handlers/main.yml
+---
+
+- name: restart bind
+  service:
+    name: "{{ bind_service }}"
+    state: restarted
--- a/roles/bind-role/meta/main.yml
+++ b/roles/bind-role/meta/main.yml
@ -0,0 +1,19 @@
+---
+galaxy_info:
+  author: Bert Van Vreckem
+  description: Sets up ISC BIND on RHEL/CentOS 6/7 or Ubuntu 16.04 LTS (Xenial) as an authoritative DNS server for a single domain (master and/or slave).
+  license: BSD
+  min_ansible_version: 2.0
+  platforms:
+    - name: EL
+      versions:
+        - 6
+        - 7
+    - name: Ubuntu
+      versions:
+        - xenial
+  galaxy_tags:
+    - networking
+    - system
+    - dns
+dependencies: []
--- a/roles/bind-role/tasks/main.yml
+++ b/roles/bind-role/tasks/main.yml
@ -0,0 +1,71 @@
+# roles/bind/tasks/main.yml
+---
+# Initialise distribution-specific variables
+- name: Source specific variables
+  include_vars: "{{ item }}"
+  with_first_found:
+    - "{{ ansible_distribution }}.yml"
+    - "{{ ansible_os_family }}.yml"
+
+- name: Check whether `bind_zone_master_server_ip` was set
+  assert:
+    that: bind_zone_master_server_ip is defined
+
+- name: Install BIND
+  apt_rpm:
+    pkg: "{{ item }}"
+    state: installed
+  with_items: "{{ bind_packages }}"
+  tags: bind
+
+- name: Ensure runtime directories referenced in config exist
+  file:
+    path: "{{ item }}"
+    state: directory
+    owner: "{{ bind_owner }}"
+    group: "{{ bind_group }}"
+    mode: 0770
+  with_items:
+    - "{{ bind_chroot }}/{{ bind_dir }}/dynamic"
+    - "{{ bind_chroot }}/{{ bind_dir }}/data"
+  tags: bind
+
+- name: Create serial, based on last two digits of year, month, day, and hour
+  command: date +%y%m%d%H
+  register: timestamp
+  changed_when: false
+  run_once: true
+  tags: bind
+
+- name: Read forward zone hashes
+  shell: 'grep "^; Hash:" {{ bind_zone_dir }}/{{ bind_zone_name }} || true'
+  changed_when: false
+  check_mode: false
+  register: forward_hashes
+
+- name: Read reverse ipv4 zone hashes
+  shell: "grep \"^; Hash:\" {{ bind_zone_dir }}/{{ ('.'.join(item.replace(item+'.','').split('.')[::-1])) }}.in-addr.arpa || true"
+  changed_when: false
+  check_mode: false
+  register: reverse_hashes
+  with_items: "{{ bind_zone_networks }}"
+
+- name: Read reverse ipv6 zone hashes
+  shell: "grep \"^; Hash:\" {{bind_zone_dir}}/{{ (item | ipaddr('revdns'))[-(9+(item|regex_replace('^.*/','')|int)//2):-1] }} || true"
+  changed_when: false
+  check_mode: false
+  register: reverse_hashes_ipv6
+  with_items: "{{ bind_zone_ipv6_networks }}"
+
+- include_tasks: master.yml
+  when: bind_zone_master_server_ip in ansible_all_ipv4_addresses
+
+- include_tasks: slave.yml
+  when: bind_zone_master_server_ip not in ansible_all_ipv4_addresses
+
+- name: Start BIND service
+  service:
+    name: "{{ bind_service }}"
+    state: started
+    enabled: yes
+  tags: bind
--- a/roles/bind-role/tasks/master.yml
+++ b/roles/bind-role/tasks/master.yml
@ -0,0 +1,53 @@
+# roles/bind/tasks/master.yml
+# Set up a BIND master server
+---
+
+- name: Master | Main BIND config file (master)
+  template:
+    src: master_etc_named.conf.j2
+    dest: "{{ bind_config }}"
+    owner: "{{ bind_owner }}"
+    group: "{{ bind_group }}"
+    mode: '0640'
+    setype: named_conf_t
+    validate: 'named-checkconf -t / %s'
+  notify: restart bind
+  tags: bind
+
+- name: Master | Create forward lookup zone file
+  template:
+    src: bind_zone.j2
+    dest: "{{ bind_chroot }}/{{ bind_zone_dir }}/{{ bind_zone_name }}"
+    owner: "{{ bind_owner }}"
+    group: "{{ bind_group }}"
+    mode: "0640"
+    setype: named_zone_t
+    validate: 'named-checkzone -d {{ bind_zone_name }} %s'
+  notify: restart bind
+  tags: bind
+
+- name: Master | Create reverse lookup zone file
+  template:
+    src: reverse_zone.j2
+    dest: "{{ bind_chroot }}/{{ bind_zone_dir }}/{{ ('.'.join(item.replace(item+'.','').split('.')[::-1])) }}.in-addr.arpa"
+    owner: "{{ bind_owner }}"
+    group: "{{ bind_group }}"
+    mode: "0640"
+    setype: named_zone_t
+    validate: "named-checkzone {{ ('.'.join(item.replace(item+'.','').split('.')[::-1])) }}.in-addr.arpa %s"
+  with_items: "{{ bind_zone_networks }}"
+  notify: restart bind
+  tags: bind
+
+- name: Master | Create reverse IPv6 lookup zone file
+  template:
+    src: reverse_zone_ipv6.j2
+    dest: "{{ bind_chroot }}/{{bind_zone_dir}}/{{ (item | ipaddr('revdns'))[-(9+(item|regex_replace('^.*/','')|int)//2):-1] }}"
+    owner: "{{ bind_owner }}"
+    group: "{{ bind_group }}"
+    mode: "0640"
+    setype: named_zone_t
+    #validate: "named-checkzone {{ (item | ipaddr('revdns'))[-(9+(item|regex_replace('^.*/','')|int)//2):] }} %s"
+  with_items: "{{ bind_zone_ipv6_networks }}"
+  #notify: restart bind
+  tags: bind
--- a/roles/bind-role/tasks/slave.yml
+++ b/roles/bind-role/tasks/slave.yml
@ -0,0 +1,16 @@
+# roles/bind/tasks/master.yml
+# Set up a BIND slave server
+---
+
+- name: Slave | Main BIND config file (slave)
+  template:
+    src: slave_etc_named.conf.j2
+    dest: "{{ bind_config }}"
+    owner: "{{ bind_owner }}"
+    group: "{{ bind_group }}"
+    mode: '0640'
+    setype: named_conf_t
+    validate: 'named-checkconf -t / %s'
+  notify: restart bind
+  tags: bind
+
--- a/roles/bind-role/templates/bind_zone.j2
+++ b/roles/bind-role/templates/bind_zone.j2
@ -0,0 +1,116 @@
+{#
+ #  First create a dict holding the entire zone information and create a hash
+ #  from it, that it can be compared with subsequent task executions. In this
+ #  way the serial will only be updated if there are some content changes.
+ #}
+{% set _zone_data = {} %}
+{% set _ = _zone_data.update({'ttl': bind_zone_ttl}) %}
+{% set _ = _zone_data.update({'domain': bind_zone_name }) %}
+{% set _ = _zone_data.update({'mname': bind_zone_name_servers}) %}
+{% set _ = _zone_data.update({'aname': bind_other_name_servers}) %}
+{% set _ = _zone_data.update({'mail': bind_zone_mail_servers}) %}
+{% set _ = _zone_data.update({'rname': (( bind_zone_hostmaster_email)) + ('' if (bind_zone_hostmaster_email | search('\.')) else ('.' + _zone_data['domain']))}) %}
+{% set _ = _zone_data.update({'refresh': bind_zone_time_to_refresh}) %}
+{% set _ = _zone_data.update({'retry': bind_zone_time_to_retry}) %}
+{% set _ = _zone_data.update({'expire': bind_zone_time_to_expire}) %}
+{% set _ = _zone_data.update({'minimum': bind_zone_minimum_ttl}) %}
+{% set _ = _zone_data.update({'hosts': bind_zone_hosts }) %}
+{% set _ = _zone_data.update({'delegate': bind_zone_delegate }) %}
+{% set _ = _zone_data.update({'services': bind_zone_services }) %}
+{% set _ = _zone_data.update({'text': bind_zone_text }) %}
+{#
+ #  Compare the zone file hash with the current zone data hash and set serial
+ #  accordingly
+ #}
+{% set _zone = {'hash': _zone_data | string | hash('md5')} %}
+{% set _hash_serial = forward_hashes.stdout.split(' ')[2:] %}
+{% if _hash_serial and _hash_serial[0] == _zone['hash'] %}
+{%   set _ = _zone.update({'serial': _hash_serial[1]}) %}
+{% else %}
+{%   set _ = _zone.update({'serial': timestamp.stdout}) %}
+{% endif %}
+{#
+ #  Eventually output the zone data
+ #}
+; Hash: {{ _zone['hash'] }} {{ _zone['serial'] }}
+; Zone file for {{ _zone_data['domain'] }}
+; {{ ansible_managed }}
+
+$ORIGIN {{ _zone_data['domain'] }}.
+$TTL {{ _zone_data['ttl'] }}
+
+{% if _zone_data['mname']|length > 0 %}
+@ IN SOA {{ _zone_data['mname']|first }}.{{ _zone_data['domain'] }}. {{ _zone_data['rname'] }}. (
+{% else %}
+@ IN SOA {{ ansible_hostname }}.{{ _zone_data['domain'] }}. {{ _zone_data['rname'] }}. (
+{% endif %}
+  {{ _zone['serial'] }}
+  {{ _zone_data['refresh'] }}
+  {{ _zone_data['retry'] }}
+  {{ _zone_data['expire'] }}
+  {{ _zone_data['minimum'] }} )
+
+{% if _zone_data['mname']|length > 0 %}
+{% for ns in _zone_data['mname'] %}
+                     IN  NS     {{ ns }}.{{ _zone_data['domain'] }}.
+{% endfor %}
+{% else %}
+                     IN  NS     {{ ansible_hostname }}.{{ _zone_data['domain'] }}.
+{% endif %}
+{% for ns in _zone_data['aname'] %}
+                     IN  NS     {{ ns }}.
+{% endfor %}
+
+{% for mail in _zone_data['mail'] %}
+{% if loop.first %}@{% else %} {% endif %}                    IN  MX     {{ mail.preference}}  {{ mail.name }}{% if not mail.name.endswith('.') %}.{{ _zone_data['domain'] }}.{% endif %} 
+{% endfor %}
+
+{% if _zone_data['delegate']|length > 0 %}
+{% for host in _zone_data['delegate'] %}
+{{ host.zone.ljust(20) }} IN  NS     {{ host.dns }}
+{% endfor %}
+{% endif %}
+
+{% if _zone_data['hosts']|length > 0 %}
+{% for host in _zone_data['hosts'] %}
+{% if host.ip is defined %}
+{% if host.ip is string %}
+{{ host.name.ljust(20) }} IN  A      {{ host.ip }}
+{% else %}
+{% for ip in host.ip %}
+{{ host.name.ljust(20) }} IN  A      {{ ip }}
+{% endfor %}
+{% endif %}
+{% endif %}
+{% if host.ipv6 is defined %}
+{% if host.ipv6 is string %}
+{{ host.name.ljust(20) }} IN  AAAA   {{ host.ipv6 }}
+{% else %}
+{% for ip6 in host.ipv6 %}
+{{ host.name.ljust(20) }} IN  AAAA   {{ ip6 }}
+{% endfor %}
+{% endif %}
+{% endif %}
+{% if host.aliases is defined %}
+{% for alias in host.aliases %}
+{{ alias.ljust(20) }} IN  CNAME  {{ host.name }}
+{% endfor %}
+{% endif %}
+{% endfor %}
+{% else %}
+{{ ansible_hostname.ljust(20) }} IN A     {{ ansible_default_ipv4.address }}
+{% endif %}
+{% for service in _zone_data['services'] %}
+{{ service.name.ljust(20) }} IN  SRV    {{ service.priority|default('0') }} {{ service.weight|default('0') }} {{ service.port }} {{ service.target }}
+{% endfor %}
+{% for text in _zone_data['text'] %}
+{% if text.text is string %}
+{{ text.name.ljust(20) }} IN  TXT    "{{ text.text }}"
+{% else %}
+{%   for entry in text.text %}
+{{ text.name.ljust(20) }} IN  TXT    "{{ entry }}"
+{%   endfor %}
+{% endif %}
+{% endfor %}
+{# vim: ft=text
+#}
--- a/roles/bind-role/templates/master_etc_named.conf.j2
+++ b/roles/bind-role/templates/master_etc_named.conf.j2
@ -0,0 +1,112 @@
+//
+// named.conf
+//
+// {{ ansible_managed }}
+//
+{% for file in bind_default_zone_files %}
+include "{{ file }}";
+{% endfor %}
+
+{% for acl in bind_acls %}
+acl "{{ acl.name }}" {
+{% for match in acl.match_list %}
+  {{ match }};
+{% endfor %}
+};
+
+{% endfor %}
+options {
+  listen-on port 53 { {{ bind_listen_ipv4|join(';') }}; };
+  listen-on-v6 port 53 { {{ bind_listen_ipv6|join(';') }}; };
+  directory "/etc/bind/zone";
+  pid-file "";
+  dump-file "/var/run/named_dump.db";
+  statistics-file "/var/run/named.stats";
+  recursing-file "/var/run/recursing";
+
+//  directory   "{{ bind_zone_dir }}";
+//  dump-file   "/var/run/named_dump.db";
+//  statistics-file "/var/run/named.stats";
+//  memstatistics-file "/var/run/named_mem.stats";
+  allow-query     { {{ bind_allow_query|join(';') }}; };
+{% if bind_acls|length != 0 %}
+  allow-transfer  { {% for acl in bind_acls %}"{{ acl.name }}"; {% endfor %}};
+{% endif %}
+{% if bind_check_names is defined %}
+  bind-check-names  {{ check-names }};
+{% endif %}
+
+  recursion {% if bind_recursion %}yes{% else %}no{% endif %};
+  {% if bind_recursion %}
+  allow-recursion { {{ bind_allow_recursion|join('; ') }}; };
+  {% endif %}
+  {% if bind_forwarders|length > 0 %}forwarders { {{ bind_forwarders|join('; ') }}; };{% endif %}
+  {% if bind_forward_only %}forward only;{% endif %}
+
+  rrset-order { order {{ bind_rrset_order }}; };
+
+  dnssec-enable {{ bind_dnssec_enable }};
+  dnssec-validation {{ bind_dnssec_validation }};
+  dnssec-lookaside auto;
+
+  /* Path to ISC DLV key */
+//  bindkeys-file "/etc/named.iscdlv.key";
+
+//  managed-keys-directory "{{ bind_dir }}/dynamic";
+
+//  pid-file "";
+  // session-keyfile "/run/named/session.key";
+};
+
+logging {
+        /*
+         * ALT Linux: if enabled, this fills log uselessly
+         */
+        category lame-servers {null;};
+};
+/*
+logging {
+  channel default_debug {
+    file "{{ bind_log }}";
+    severity dynamic;
+    print-time yes;
+  };
+};
+*/
+zone "{{ bind_zone_name }}" IN {
+  type master;
+  file "{{ bind_zone_name }}";
+  notify yes;
+{% if bind_zone_also_notify|length > 0 %}
+  also-notify  { {{ bind_zone_also_notify|join(';') }}; };
+{% endif %}
+  allow-update { {{ bind_allow_update|join(';') }}; };
+};
+
+{% if bind_zone_networks is defined %}
+{% for network in bind_zone_networks %}
+zone "{{ ('.'.join(network.replace(network+'.','').split('.')[::-1])) }}.in-addr.arpa" IN {
+  type master;
+  file "{{ ('.'.join(network.replace(network+'.','').split('.')[::-1])) }}.in-addr.arpa";
+  notify yes;
+{% if bind_zone_also_notify|length > 0 %}
+  also-notify  { {{ bind_zone_also_notify|join(';') }}; };
+{% endif %}
+  allow-update { {{ bind_allow_update|join(';') }}; };
+};
+{% endfor %}
+{% endif %}
+
+{% if bind_zone_ipv6_networks is defined %}
+{% for network in bind_zone_ipv6_networks %}
+zone "{{ (network | ipaddr('revdns'))[-(9+(network|regex_replace('^.*/','')|int)//2):] }}" IN {
+  type master;
+  file "{{ (network | ipaddr('revdns'))[-(9+(network|regex_replace('^.*/','')|int)//2):-1] }}";
+  notify yes;
+{% if bind_zone_also_notify|length > 0 %}
+  also-notify  { {{ bind_zone_also_notify|join(';') }}; };
+{% endif %}
+  allow-update { {{ bind_allow_update|join(';') }}; };
+};
+{% endfor %}
+{% endif %}
--- a/roles/bind-role/templates/reverse_zone.j2
+++ b/roles/bind-role/templates/reverse_zone.j2
@ -0,0 +1,96 @@
+{#
+ #  First create a dict holding the entire zone information and create a hash
+ #  from it, that it can be compared with subsequent task executions. In this
+ #  way the serial will only be updated if there are some content changes.
+ #}
+{% set _zone_data = {} %}
+{% set _ = _zone_data.update({'ttl': bind_zone_ttl}) %}
+{% set _ = _zone_data.update({'domain': bind_zone_name }) %}
+{% set _ = _zone_data.update({'mname': bind_zone_name_servers}) %}
+{% set _ = _zone_data.update({'aname': bind_other_name_servers}) %}
+{% set _ = _zone_data.update({'rname': (( bind_zone_hostmaster_email)) + ('' if (bind_zone_hostmaster_email | search('\.')) else ('.' + _zone_data['domain']))}) %}
+{% set _ = _zone_data.update({'refresh': bind_zone_time_to_refresh}) %}
+{% set _ = _zone_data.update({'retry': bind_zone_time_to_retry}) %}
+{% set _ = _zone_data.update({'expire': bind_zone_time_to_expire}) %}
+{% set _ = _zone_data.update({'minimum': bind_zone_minimum_ttl}) %}
+{% set _ = _zone_data.update({'hosts': bind_zone_hosts | selectattr('ip', 'defined') | selectattr('ip', 'string') | selectattr('ip', 'search', '^'+item) | list }) %}
+{% set _ = _zone_data.update({'revip': ('.'.join(item.replace(item+'.','').split('.')[::-1])) }) %}
+{#
+ #  Compare the zone file hash with the current zone data hash and set serial
+ #  accordingly
+ #}
+{% set _zone = {'hash': _zone_data | string | hash('md5')} %}
+{% for _result in reverse_hashes.results %}
+{%   if (item in _result.item ) %}
+{%     set _hash_serial = _result.stdout.split(' ')[2:] %}
+{%     if _hash_serial and _hash_serial[0] == _zone['hash'] %}
+{%       set _ = _zone.update({'serial': _hash_serial[1]}) %}
+{%     else %}
+{%       set _ = _zone.update({'serial': timestamp.stdout}) %}
+{%     endif %}
+{%   endif %}
+{% endfor %}
+{#
+ #  Eventually output the zone data
+ #}
+; Hash: {{ _zone['hash'] }} {{ _zone['serial'] }}
+; Reverse zone file for {{ _zone_data['domain'] }}
+; {{ ansible_managed }}
+; vi: ft=bindzone
+
+$TTL {{ _zone_data['ttl'] }}
+$ORIGIN {{ ('.'.join(item.replace(item+'.','').split('.')[::-1])) }}.in-addr.arpa.
+
+{% if _zone_data['mname']|length > 0 %}
+@ IN SOA {{ _zone_data['mname']|first }}.{{ _zone_data['domain'] }}. {{ _zone_data['rname'] }}. (
+{% else %}
+@ IN SOA {{ ansible_hostname }}.{{ _zone_data['domain'] }}. {{ _zone_data['rname'] }}. (
+{% endif %}
+  {{ _zone['serial'] }}
+  {{ _zone_data['refresh'] }}
+  {{ _zone_data['retry'] }}
+  {{ _zone_data['expire'] }}
+  {{ _zone_data['minimum'] }} )
+
+{% if _zone_data['mname']|length > 0 %}
+{% for ns in _zone_data['mname'] %}
+                 IN  NS   {{ ns }}.{{ _zone_data['domain'] }}.
+{% endfor %}
+{% else %}
+                 IN  NS   {{ ansible_hostname }}.{{ _zone_data['domain'] }}.
+{% endif %}
+{% for ns in _zone_data['aname'] %}
+                 IN  NS   {{ ns }}.
+{% endfor %}
+
+{% if _zone_data['hosts']|length > 0 %}
+{% for host in _zone_data['hosts'] %}
+{% if host.ip is defined %}
+{% if host.ip == item %}
+@                IN  PTR  {{ host.name }}.{{ _zone_data['domain'] }}.
+{% else %}
+{% if host.ip is string and host.ip.startswith(item) %}
+{% if host.name == '@' %}
+{{ ('.'.join(host.ip.replace(item+'.','').split('.')[::-1])).ljust(16) }} IN  PTR  {{ _zone_data['domain'] }}.
+{% else %}
+{{ ('.'.join(host.ip.replace(item+'.','').split('.')[::-1])).ljust(16) }} IN  PTR  {{ host.name }}.{{ _zone_data['domain'] }}.
+{% endif %}
+{% else %}
+{% for ip in host.ip %}
+{% if ip.startswith(item) %}
+{{ ('.'.join(ip.replace(item+'.','').split('.')[::-1])).ljust(16) }} IN  PTR  {{ _zone_data['domain'] }}.
+{% if host.name == '@' %}
+{% else %}
+{{ ('.'.join(ip.replace(item+'.','').split('.')[::-1])).ljust(16) }} IN  PTR  {{ host.name }}.{{ _zone_data['domain'] }}.
+{% endif %}
+{% endif %}
+{% endfor %}
+{% endif %}
+{% endif %}
+{% endif %}
+{% endfor %}
+{% else %}
+{{ ('.'.join(ansible_default_ipv4.address.replace(item+'.','').split('.')[::-1])).ljust(16) }} IN  PTR  {{ ansible_hostname }}.{{ _zone_data['domain'] }}.
+{% endif %}
+{# vim: ft=text
+#}
--- a/roles/bind-role/templates/reverse_zone_ipv6.j2
+++ b/roles/bind-role/templates/reverse_zone_ipv6.j2
@ -0,0 +1,96 @@
+{#
+ #  First create a dict holding the entire zone information and create a hash
+ #  from it, that it can be compared with subsequent task executions. In this
+ #  way the serial will only be updated if there are some content changes.
+ #}
+{% set _zone_data = {} %}
+{% set _ = _zone_data.update({'ttl': bind_zone_ttl}) %}
+{% set _ = _zone_data.update({'domain': bind_zone_name }) %}
+{% set _ = _zone_data.update({'mname': bind_zone_name_servers}) %}
+{% set _ = _zone_data.update({'aname': bind_other_name_servers}) %}
+{% set _ = _zone_data.update({'rname': (( bind_zone_hostmaster_email)) + ('' if (bind_zone_hostmas