Add support for dnsdist 1.9

.ansible-lint

@@ -2,4 +2,4 @@
 exclude_paths:
   - molecule/
 skip_list:
-  - '306' # [306] Shells that use pipes should set the pipefail option
+  - '306'  # [306] Shells that use pipes should set the pipefail option

.github/workflows/main.yml

@@ -22,6 +22,7 @@ jobs:
           - dnsdist-16
           - dnsdist-17
           - dnsdist-18
+          - dnsdist-19
           - dnsdist-master
     steps:
       - name: checkout

meta/main.yml

@@ -14,9 +14,9 @@ galaxy_info:
         - "8"
     - name: Debian
       versions:
-        - jessie
         - stretch
         - buster
+        - bookworm
     - name: Ubuntu
       versions:
         - trusty

molecule/dnsdist-16/molecule.yml

@@ -18,10 +18,6 @@ platforms:
     image: quay.io/centos/centos:stream8
     dockerfile_tpl: centos-systemd
 
-  - name: ubuntu-1804
-    image: ubuntu:18.04
-    dockerfile_tpl: debian-systemd
-
   - name: ubuntu-2004
     image: ubuntu:20.04
     dockerfile_tpl: debian-systemd

molecule/dnsdist-17/molecule.yml

@@ -22,10 +22,6 @@ platforms:
     image: oraclelinux:9
     dockerfile_tpl: oraclelinux-systemd
 
-  - name: ubuntu-1804
-    image: ubuntu:18.04
-    dockerfile_tpl: debian-systemd
-
   - name: ubuntu-2004
     image: ubuntu:20.04
     dockerfile_tpl: debian-systemd

molecule/dnsdist-18/molecule.yml

@@ -30,6 +30,14 @@ platforms:
     image: debian:10
     dockerfile_tpl: debian-systemd
 
+  - name: debian-11
+    image: debian:11
+    dockerfile_tpl: debian-python3
+
+  - name: debian-12
+    image: debian:12
+    dockerfile_tpl: debian-python3
+
 provisioner:
   name: ansible
   options:

molecule/dnsdist-19/converge.yml

@@ -0,0 +1,8 @@
+---
+
+- hosts: all
+  vars_files:
+    - ../resources/vars/dnsdist-common.yml
+    - ../resources/vars/dnsdist-repo-19.yml
+  roles:
+    - { role: powerdns.dnsdist }

molecule/dnsdist-19/molecule.yml

@@ -0,0 +1,63 @@
+---
+
+scenario:
+  name: dnsdist-19
+
+driver:
+  name: docker
+
+dependency:
+  name: galaxy
+
+platforms:
+  - name: centos-7
+    image: centos:7
+    dockerfile_tpl: centos-systemd
+
+  - name: centos-8
+    image: quay.io/centos/centos:stream8
+    dockerfile_tpl: centos-systemd
+
+  - name: oraclelinux-9
+    image: oraclelinux:9
+    dockerfile_tpl: oraclelinux-systemd
+
+  - name: ubuntu-2004
+    image: ubuntu:20.04
+    dockerfile_tpl: ubuntu-systemd
+
+  - name: debian-10
+    image: debian:10
+    dockerfile_tpl: debian-systemd
+
+  - name: debian-11
+    image: debian:11
+    dockerfile_tpl: debian-python3
+
+  - name: debian-12
+    image: debian:12
+    dockerfile_tpl: debian-python3
+
+provisioner:
+  name: ansible
+  options:
+    diff: True
+    v: True
+  inventory:
+    links:
+      host_vars: ../resources/host_vars/
+  playbooks:
+    create: ../resources/create.yml
+    destroy: ../resources/destroy.yml
+    prepare: ../resources/prepare.yml
+
+#lint: yamllint vars tasks defaults meta
+
+verifier:
+  name: testinfra
+  options:
+    vvv: True
+  directory: ../resources/tests/all
+  additional_files_or_dirs:
+    # path relative to 'directory'
+    - ../repo-19/

molecule/resources/Dockerfile.debian-python3.j2

@@ -0,0 +1,25 @@
+# Molecule managed
+
+FROM {{ item.image }}
+
+RUN if [ $(command -v apt-get) ]; then apt-get update && apt-get upgrade -y && apt-get install -y systemd && apt-get clean; fi
+RUN if [ ! -e /sbin/init ]; then ln -s /lib/systemd/systemd /sbin/init ; fi
+
+ENV container docker
+
+# Don't start the optional systemd services. 
+RUN find /etc/systemd/system \
+         /lib/systemd/system \
+         -path '*.wants/*' \
+         -not -name '*journald*' \
+         -not -name '*systemd-tmpfiles*' \
+         -not -name '*systemd-user-sessions*' \
+         -exec rm \{} \;
+
+RUN systemctl set-default multi-user.target
+
+VOLUME [ "/sys/fs/cgroup" ]
+
+CMD ["/sbin/init"]
+
+RUN if [ $(command -v apt-get) ]; then apt-get update && apt-get upgrade -y && apt-get install -y python3 sudo bash net-tools ca-certificates && apt-get clean; fi

molecule/resources/host_vars/debian-11.yml

@@ -0,0 +1,3 @@
+---
+
+ansible_python_interpreter: "/usr/bin/python3"

molecule/resources/host_vars/debian-12.yml

@@ -0,0 +1,3 @@
+---
+
+ansible_python_interpreter: "/usr/bin/python3"

molecule/resources/tests/repo-19/test_repo_19.py

@@ -0,0 +1,32 @@
+
+debian_os = ['debian', 'ubuntu']
+rhel_os = ['redhat', 'centos', 'oracleserver', 'oraclelinux']
+
+
+def test_repo_file(host):
+    f = None
+    if host.system_info.distribution.lower() in debian_os:
+        f = host.file('/etc/apt/sources.list.d/powerdns-dnsdist-19.list')
+    if host.system_info.distribution.lower() in rhel_os:
+        f = host.file('/etc/yum.repos.d/powerdns-dnsdist-19.repo')
+
+    assert f.exists
+    assert f.user == 'root'
+    assert f.group == 'root'
+
+
+def test_pdns_repo(host):
+    f = None
+    if host.system_info.distribution.lower() in debian_os:
+        f = host.file('/etc/apt/sources.list.d/powerdns-dnsdist-19.list')
+    if host.system_info.distribution.lower() in rhel_os:
+        f = host.file('/etc/yum.repos.d/powerdns-dnsdist-19.repo')
+
+    assert f.exists
+    assert f.contains('dnsdist-19')
+
+
+def test_pdns_version(host):
+    cmd = host.run('/usr/bin/dnsdist --version')
+
+    assert 'dnsdist 1.9' in cmd.stdout

molecule/resources/vars/dnsdist-repo-19.yml

@@ -0,0 +1,7 @@
+---
+
+##
+# Dnsdist 1.9.x Repository
+##
+
+dnsdist_install_repo: "{{ dnsdist_powerdns_repo_19 }}"

vars/main.yml

@@ -34,3 +34,12 @@ dnsdist_powerdns_repo_18:
   yum_repo_baseurl: http://repo.powerdns.com/centos/$basearch/$releasever/dnsdist-18
   yum_debug_symbols_repo_baseurl: http://repo.powerdns.com/centos/$basearch/$releasever/dnsdist-18/debug
   name: powerdns-dnsdist-18
+
+dnsdist_powerdns_repo_19:
+  apt_repo_origin: repo.powerdns.com
+  apt_repo: deb [arch=amd64] http://repo.powerdns.com/{{ ansible_distribution | lower }} {{ ansible_distribution_release | lower }}-dnsdist-19 main
+  gpg_key: http://repo.powerdns.com/FD380FBB-pub.asc
+  gpg_key_id: 9FAAA5577E8FCF62093D036C1B0C6205FD380FBB
+  yum_repo_baseurl: http://repo.powerdns.com/centos/$basearch/$releasever/dnsdist-19
+  yum_debug_symbols_repo_baseurl: http://repo.powerdns.com/centos/$basearch/$releasever/dnsdist-19/debug
+  name: powerdns-dnsdist-19