diff --git a/README.md b/README.md index 51efd0d..79c7980 100644 --- a/README.md +++ b/README.md @@ -9,7 +9,7 @@ An Ansible role created by the folks behind PowerDNS to setup the [PowerDNS Auth ## Requirements -An Ansible 2.9 or higher installation. +An Ansible 2.12 or higher installation. ## Dependencies @@ -32,12 +32,6 @@ By default, the PowerDNS Authoritative Server is installed from the software rep - { role: PowerDNS.pdns, pdns_install_repo: "{{ pdns_auth_powerdns_repo_master }}" -# Install the PowerDNS Authoritative Server from the '4.5.x' official repository -- hosts: all - roles: - - { role: PowerDNS.pdns, - pdns_install_repo: "{{ pdns_auth_powerdns_repo_45 }}" - # Install the PowerDNS Authoritative Server from the '4.6.x' official repository - hosts: all roles: @@ -353,7 +347,7 @@ To test all the scenarios run To run a custom molecule command - $ tox -e ansible210 -- molecule test -s pdns-44 + $ tox -e ansible214 -- molecule test -s pdns-47 ## License diff --git a/molecule/pdns-45/converge.yml b/molecule/pdns-45/converge.yml deleted file mode 100644 index 6b6cfcf..0000000 --- a/molecule/pdns-45/converge.yml +++ /dev/null @@ -1,9 +0,0 @@ ---- - -- hosts: pdns - vars_files: - - ../resources/vars/pdns-common.yml - - ../resources/vars/pdns-repo-45.yml - - ../resources/vars/pdns-backends.yml - roles: - - { role: powerdns.pdns } diff --git a/molecule/pdns-45/molecule.yml b/molecule/pdns-45/molecule.yml deleted file mode 100644 index 39ab956..0000000 --- a/molecule/pdns-45/molecule.yml +++ /dev/null @@ -1,94 +0,0 @@ ---- - -scenario: - name: pdns-45 - -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-45/ - - ../backend-sqlite/ - - ../backend-mysql/ - - ../systemd-override/ - lint: flake8 diff --git a/molecule/pdns-46/molecule.yml b/molecule/pdns-46/molecule.yml index 8968caa..f6746ad 100644 --- a/molecule/pdns-46/molecule.yml +++ b/molecule/pdns-46/molecule.yml @@ -91,4 +91,4 @@ verifier: - ../backend-sqlite/ - ../backend-mysql/ - ../systemd-override/ - lint: flake8 + diff --git a/molecule/pdns-47/molecule.yml b/molecule/pdns-47/molecule.yml index fa761b7..87b3081 100644 --- a/molecule/pdns-47/molecule.yml +++ b/molecule/pdns-47/molecule.yml @@ -96,4 +96,4 @@ verifier: - ../backend-sqlite/ - ../backend-mysql/ - ../systemd-override/ - lint: flake8 + diff --git a/molecule/pdns-master/molecule.yml b/molecule/pdns-master/molecule.yml index 03cd5a8..6e295f2 100644 --- a/molecule/pdns-master/molecule.yml +++ b/molecule/pdns-master/molecule.yml @@ -30,11 +30,6 @@ platforms: image: ubuntu:18.04 dockerfile_tpl: debian-systemd - - name: debian-9 - groups: ["pdns"] - image: debian:9 - dockerfile_tpl: debian-systemd - - name: debian-10 groups: ["pdns"] image: debian:10 @@ -87,4 +82,4 @@ verifier: - ../backend-sqlite/ - ../backend-mysql/ - ../systemd-override/ - lint: flake8 + diff --git a/molecule/pdns-os-repos/molecule.yml b/molecule/pdns-os-repos/molecule.yml index 7d7b66e..f35af49 100644 --- a/molecule/pdns-os-repos/molecule.yml +++ b/molecule/pdns-os-repos/molecule.yml @@ -71,4 +71,4 @@ verifier: - ../systemd-override/ - ../backend-sqlite/ - ../backend-mysql/ - lint: flake8 + diff --git a/requirements.yml b/requirements.yml index 59cbeea..5eb9382 100644 --- a/requirements.yml +++ b/requirements.yml @@ -2,3 +2,5 @@ collections: - name: community.mysql - name: community.general + - name: community.docker + - name: ansible.posix \ No newline at end of file diff --git a/test-requirements.txt b/test-requirements.txt index 75a0a48..542765f 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -1,7 +1,7 @@ -ansible-lint==5.4.0 -yamllint==1.29.0 -molecule[docker]==4.0.0 -molecule[lint]==4.0.0 -pytest-testinfra==6.7.0 -docker==5.0.3 - +ansible-lint==6.17.2 +yamllint==1.32.0 +molecule-plugins[docker]==23.4.1 +molecule-plugins[lint]==23.4.1 +molecule==5.1.0 +pytest-testinfra==8.1.0 +docker==6.1.3