ci: fix pdns-os-repos tests

molecule/resources/Dockerfile.debian-systemd.j2

@@ -22,4 +22,4 @@ 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 python python3 sudo bash net-tools ca-certificates && apt-get clean; fi
+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-10.yml

@@ -2,3 +2,6 @@
 
 ansible_python_interpreter: "/usr/bin/python3"
 
+# pdns-os-repos: debian-10 installs auth 4.1.6
+_pdns_config_legacy:
+  master: true

molecule/resources/host_vars/debian-11.yml

@@ -0,0 +1,5 @@
+---
+
+# pdns-os-repos: debian-11 installs auth 4.4.1
+_pdns_config_legacy:
+  master: true

molecule/resources/host_vars/ubuntu-2004.yml

@@ -1,3 +1,7 @@
 ---
 
 ansible_python_interpreter: "/usr/bin/python3"
+
+# pdns-os-repos: ubuntu-20.04 installs auth 4.4.1
+_pdns_config_legacy:
+  master: true

molecule/resources/vars/pdns-os-repos.yml

@@ -4,10 +4,7 @@
 # PowerDNS Configuration
 ##
 
-pdns_config:
-
-  # Turns on master operations
-  primary: true
+_pdns_config_base:
 
   # Listen Address
   local-address: "127.0.0.1"
@@ -22,5 +19,11 @@ pdns_config:
   webserver-address: "0.0.0.0"
   webserver-port: "8001"
 
+# Turns on master operations
+_pdns_config_primary:
+  primary: true
+
+pdns_config: "{{ _pdns_config_base | combine(_pdns_config_legacy | default(_pdns_config_primary), recursive=True) }}"
+
 pdns_service_overrides:
   LimitCORE: infinity

vars/Debian.yml

@@ -9,7 +9,6 @@ default_pdns_debug_symbols_package_name: "pdns-server-dbg"
 # Packages needed to install MySQL
 pdns_mysql_packages:
   - default-mysql-client
-  - python-mysqldb
   - python3-mysqldb
 
 # List of PowerDNS Authoritative Server Backends packages on Debian