Merge pull request #135 from eschultz/patch-1

Added pdns_auth 4.7

.github/workflows/main.yml

@@ -17,6 +17,8 @@ jobs:
  - pdns-43
  - pdns-44
  - pdns-45
+ - pdns-46
+ - pdns-47
  - pdns-master
  - pdns-os-repos
  - systemd-no-overrides

molecule/pdns-46/converge.yml

@@ -0,0 +1,9 @@
+---
+
+- hosts: pdns
+ vars_files:
+ - ../resources/vars/pdns-common.yml
+ - ../resources/vars/pdns-repo-46.yml
+ - ../resources/vars/pdns-backends.yml
+ roles:
+ - { role: pdns-ansible }

molecule/pdns-46/molecule.yml

@@ -0,0 +1,94 @@
+---
+
+scenario:
+ name: pdns-46
+
+driver:
+ name: docker
+
+dependency:
+ name: galaxy
+
+platforms:
+ - name: centos-7
+ groups: ["pdns"]
+ image: centos:7
+ dockerfile_tpl: centos-systemd
+
+ - name: oraclelinux-8
+ groups: ["pdns"]
+ image: oraclelinux:8
+ dockerfile_tpl: centos-systemd
+
+ - name: ubuntu-2004
+ groups: ["pdns"]
+ image: ubuntu:20.04
+ tmpfs:
+ - /run
+ - /tmp
+ dockerfile_tpl: debian-systemd
+
+ - name: debian-10
+ groups: ["pdns"]
+ image: debian:10
+ privileged: True
+ volume_mounts:
+ - "/sys/fs/cgroup:/sys/fs/cgroup:rw"
+ tmpfs:
+ - /run
+ - /run/lock
+ - /tmp
+ dockerfile_tpl: debian-systemd
+ environment: { container: docker }
+
+ # In order to run the tests we need
+ # a MySQL container to be up & running
+ - name: mysql
+ image: mysql:5.7
+ env:
+ MYSQL_ROOT_PASSWORD: pdns
+ # Declaring the container as service,
+ # will link it to the others Platforms containers
+ # on creation.
+ is_service: yes
+
+provisioner:
+ name: ansible
+ options:
+ diff: True
+ v: True
+ config_options:
+ defaults:
+ gathering: smart
+ fact_caching: jsonfile
+ fact_caching_connection: .ansible_cache
+ fact_caching_timeout: 7200
+ ssh_connection:
+ pipelining: true
+ inventory:
+ links:
+ host_vars: ../resources/host_vars/
+ playbooks:
+ create: ../resources/create.yml
+ destroy: ../resources/destroy.yml
+ prepare: ../resources/prepare.yml
+ # "systemctl used in place of systemd module" "ANSIBLE0006"
+ # "Tasks that run when changed should likely be handlers" "ANSIBLE0016"
+ # "Shells that use pipes should set the pipefail option" "306"
+ lint: ansible-lint -x ANSIBLE0006 ANSIBLE0016 306
+
+lint: yamllint defaults tasks meta vars
+
+verifier:
+ name: testinfra
+ options:
+ hosts: "pdns"
+ vvv: True
+ directory: ../resources/tests/all
+ additional_files_or_dirs:
+ # path relative to 'directory'
+ - ../repo-46/
+ - ../backend-sqlite/
+ - ../backend-mysql/
+ - ../systemd-override/
+ lint: flake8

molecule/pdns-47/converge.yml

@@ -0,0 +1,9 @@
+---
+
+- hosts: pdns
+ vars_files:
+ - ../resources/vars/pdns-common.yml
+ - ../resources/vars/pdns-repo-47.yml
+ - ../resources/vars/pdns-backends.yml
+ roles:
+ - { role: pdns-ansible }

molecule/pdns-47/molecule.yml

@@ -0,0 +1,94 @@
+---
+
+scenario:
+ name: pdns-47
+
+driver:
+ name: docker
+
+dependency:
+ name: galaxy
+
+platforms:
+ - name: centos-7
+ groups: ["pdns"]
+ image: centos:7
+ dockerfile_tpl: centos-systemd
+
+ - name: oraclelinux-8
+ groups: ["pdns"]
+ image: oraclelinux:8
+ dockerfile_tpl: centos-systemd
+
+ - name: ubuntu-2004
+ groups: ["pdns"]
+ image: ubuntu:20.04
+ tmpfs:
+ - /run
+ - /tmp
+ dockerfile_tpl: debian-systemd
+
+ - name: debian-10
+ groups: ["pdns"]
+ image: debian:10
+ privileged: True
+ volume_mounts:
+ - "/sys/fs/cgroup:/sys/fs/cgroup:rw"
+ tmpfs:
+ - /run
+ - /run/lock
+ - /tmp
+ dockerfile_tpl: debian-systemd
+ environment: { container: docker }
+
+ # In order to run the tests we need
+ # a MySQL container to be up & running
+ - name: mysql
+ image: mysql:5.7
+ env:
+ MYSQL_ROOT_PASSWORD: pdns
+ # Declaring the container as service,
+ # will link it to the others Platforms containers
+ # on creation.
+ is_service: yes
+
+provisioner:
+ name: ansible
+ options:
+ diff: True
+ v: True
+ config_options:
+ defaults:
+ gathering: smart
+ fact_caching: jsonfile
+ fact_caching_connection: .ansible_cache
+ fact_caching_timeout: 7200
+ ssh_connection:
+ pipelining: true
+ inventory:
+ links:
+ host_vars: ../resources/host_vars/
+ playbooks:
+ create: ../resources/create.yml
+ destroy: ../resources/destroy.yml
+ prepare: ../resources/prepare.yml
+ # "systemctl used in place of systemd module" "ANSIBLE0006"
+ # "Tasks that run when changed should likely be handlers" "ANSIBLE0016"
+ # "Shells that use pipes should set the pipefail option" "306"
+ lint: ansible-lint -x ANSIBLE0006 ANSIBLE0016 306
+
+lint: yamllint defaults tasks meta vars
+
+verifier:
+ name: testinfra
+ options:
+ hosts: "pdns"
+ vvv: True
+ directory: ../resources/tests/all
+ additional_files_or_dirs:
+ # path relative to 'directory'
+ - ../repo-47/
+ - ../backend-sqlite/
+ - ../backend-mysql/
+ - ../systemd-override/
+ lint: flake8

molecule/resources/vars/pdns-repo-46.yml

@@ -0,0 +1,7 @@
+---
+
+##
+# PowerDNS 4.6.x Repository
+##
+
+pdns_install_repo: "{{ pdns_auth_powerdns_repo_46 }}"

molecule/resources/vars/pdns-repo-47.yml

@@ -0,0 +1,7 @@
+---
+
+##
+# PowerDNS 4.7.x Repository
+##
+
+pdns_install_repo: "{{ pdns_auth_powerdns_repo_47 }}"

vars/main.yml

@@ -35,6 +35,7 @@ pdns_auth_powerdns_repo_45:
  yum_repo_baseurl: "http://repo.powerdns.com/centos/$basearch/$releasever/auth-45"
  yum_debug_symbols_repo_baseurl: "http://repo.powerdns.com/centos/$basearch/$releasever/auth-45/debug"
  name: "powerdns-auth-45"
+
 pdns_auth_powerdns_repo_46:
  apt_repo_origin: "repo.powerdns.com"
  apt_repo: "deb [arch=amd64] http://repo.powerdns.com/{{ ansible_distribution | lower }} {{ ansible_distribution_release | lower }}-auth-46 main"
@@ -44,6 +45,16 @@ pdns_auth_powerdns_repo_46:
  yum_debug_symbols_repo_baseurl: "http://repo.powerdns.com/centos/$basearch/$releasever/auth-46/debug"
  name: "powerdns-auth-46"
 
+pdns_auth_powerdns_repo_47:
+ apt_repo_origin: "repo.powerdns.com"
+ apt_repo: "deb [arch=amd64] http://repo.powerdns.com/{{ ansible_distribution | lower }} {{ ansible_distribution_release | lower }}-auth-47 main"
+ gpg_key: "http://repo.powerdns.com/FD380FBB-pub.asc"
+ gpg_key_id: "9FAAA5577E8FCF62093D036C1B0C6205FD380FBB"
+ yum_repo_baseurl: "http://repo.powerdns.com/centos/$basearch/$releasever/auth-47"
+ yum_debug_symbols_repo_baseurl: "http://repo.powerdns.com/centos/$basearch/$releasever/auth-47/debug"
+ name: "powerdns-auth-47"
+
+
 default_pdns_service_overrides: >-
  {{ { 'User' : pdns_user
  , 'Group' : pdns_group