Add repo removal logic

CHANGELOG.md

@@ -1,3 +1,9 @@
+## v1.7.3 (Unreleased)
+
+IMPROVEMENTS:
+- Rework apt and dnf repo file creation to stop using version suffixed file names which are not cleaned up on version changes ([\#183](https://github.com/PowerDNS/dnsdist-ansible/pull/183), @l00d3r)
+- Remove version suffixed apt and dnf repo files ([\#183](https://github.com/PowerDNS/dnsdist-ansible/pull/183), @l00d3r)
+
 ## v1.7.2 (2026-02-23)
 
 BUG FIXES:

defaults/main.yml

@@ -151,3 +151,15 @@ dnsdist_tlslocals: []
 # - Force a downgrade
 # - Automation of test scenario's where switching between versions on the same server is necessary
 dnsdist_force_reinstall: false
+
+# Name of installable repo
+dnsdist_install_repo_name: powerdns-dnsdist
+
+# Regex for matching and removing non-version suffixed repos
+dnsdist_install_repo_regex: "{{ '^' + dnsdist_install_repo_name + '\\.(list|sources|repo|asc)$' }}"
+
+# Regex for matching and removing version suffixed repos
+dnsdist_remove_versioned_repo_regex: '^powerdns-dnsdist-(master|\d+)\.(list|sources|repo|asc)$'
+
+# When set to true remove version suffixed repos, set to false to keep using version suffixed repos
+dnsdist_remove_versioned_repo_files: true

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

@@ -6,9 +6,9 @@
 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.sources')
+        f = host.file('/etc/apt/sources.list.d/powerdns-dnsdist.sources')
     if host.system_info.distribution.lower() in rhel_os:
-        f = host.file('/etc/yum.repos.d/powerdns-dnsdist-19.repo')
+        f = host.file('/etc/yum.repos.d/powerdns-dnsdist.repo')
 
     assert f.exists
     assert f.user == 'root'
@@ -18,17 +18,17 @@ def test_repo_file(host):
 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.sources')
+        f = host.file('/etc/apt/sources.list.d/powerdns-dnsdist.sources')
     if host.system_info.distribution.lower() in rhel_os:
-        f = host.file('/etc/yum.repos.d/powerdns-dnsdist-19.repo')
+        f = host.file('/etc/yum.repos.d/powerdns-dnsdist.repo')
 
     assert f.exists
     assert f.contains('dnsdist-19')
 
 
 def test_pdns_repo_architecture(host):
     if host.system_info.distribution.lower() in debian_os:
-        f = host.file('/etc/apt/sources.list.d/powerdns-dnsdist-19.sources')
+        f = host.file('/etc/apt/sources.list.d/powerdns-dnsdist.sources')
         apt_arch = host.check_output('dpkg --print-architecture').strip()
 
         assert f.contains(f'Architectures: {apt_arch}')

molecule/resources/tests/repo-20/test_repo_20.py

@@ -6,9 +6,9 @@
 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-20.sources')
+        f = host.file('/etc/apt/sources.list.d/powerdns-dnsdist.sources')
     if host.system_info.distribution.lower() in rhel_os:
-        f = host.file('/etc/yum.repos.d/powerdns-dnsdist-20.repo')
+        f = host.file('/etc/yum.repos.d/powerdns-dnsdist.repo')
 
     assert f.exists
     assert f.user == 'root'
@@ -18,17 +18,17 @@ def test_repo_file(host):
 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-20.sources')
+        f = host.file('/etc/apt/sources.list.d/powerdns-dnsdist.sources')
     if host.system_info.distribution.lower() in rhel_os:
-        f = host.file('/etc/yum.repos.d/powerdns-dnsdist-20.repo')
+        f = host.file('/etc/yum.repos.d/powerdns-dnsdist.repo')
 
     assert f.exists
     assert f.contains('dnsdist-20')
 
 
 def test_pdns_repo_architecture(host):
     if host.system_info.distribution.lower() in debian_os:
-        f = host.file('/etc/apt/sources.list.d/powerdns-dnsdist-20.sources')
+        f = host.file('/etc/apt/sources.list.d/powerdns-dnsdist.sources')
         apt_arch = host.check_output('dpkg --print-architecture').strip()
 
         assert f.contains(f'Architectures: {apt_arch}')

molecule/resources/tests/repo-21/test_repo_21.py

@@ -6,9 +6,9 @@
 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-21.sources')
+        f = host.file('/etc/apt/sources.list.d/powerdns-dnsdist.sources')
     if host.system_info.distribution.lower() in rhel_os:
-        f = host.file('/etc/yum.repos.d/powerdns-dnsdist-21.repo')
+        f = host.file('/etc/yum.repos.d/powerdns-dnsdist.repo')
 
     assert f.exists
     assert f.user == 'root'
@@ -18,17 +18,17 @@ def test_repo_file(host):
 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-21.sources')
+        f = host.file('/etc/apt/sources.list.d/powerdns-dnsdist.sources')
     if host.system_info.distribution.lower() in rhel_os:
-        f = host.file('/etc/yum.repos.d/powerdns-dnsdist-21.repo')
+        f = host.file('/etc/yum.repos.d/powerdns-dnsdist.repo')
 
     assert f.exists
     assert f.contains('dnsdist-21')
 
 
 def test_pdns_repo_architecture(host):
     if host.system_info.distribution.lower() in debian_os:
-        f = host.file('/etc/apt/sources.list.d/powerdns-dnsdist-21.sources')
+        f = host.file('/etc/apt/sources.list.d/powerdns-dnsdist.sources')
         apt_arch = host.check_output('dpkg --print-architecture').strip()
 
         assert f.contains(f'Architectures: {apt_arch}')

molecule/resources/tests/repo-master/test_repo_master.py

@@ -6,9 +6,9 @@
 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-master.sources')
+        f = host.file('/etc/apt/sources.list.d/powerdns-dnsdist.sources')
     if host.system_info.distribution.lower() in rhel_os:
-        f = host.file('/etc/yum.repos.d/powerdns-dnsdist-master.repo')
+        f = host.file('/etc/yum.repos.d/powerdns-dnsdist.repo')
 
     assert f.exists
     assert f.user == 'root'
@@ -18,9 +18,9 @@ def test_repo_file(host):
 def test_dnsdist_repo(host):
     f = None
     if host.system_info.distribution.lower() in debian_os:
-        f = host.file('/etc/apt/sources.list.d/powerdns-dnsdist-master.sources')
+        f = host.file('/etc/apt/sources.list.d/powerdns-dnsdist.sources')
     if host.system_info.distribution.lower() in rhel_os:
-        f = host.file('/etc/yum.repos.d/powerdns-dnsdist-master.repo')
+        f = host.file('/etc/yum.repos.d/powerdns-dnsdist.repo')
 
     assert f.exists
     assert f.contains('dnsdist-master')

tasks/main.yml

@@ -5,6 +5,15 @@
   tags:
     - always
 
+- name: Set fact for repo name
+  when: "dnsdist_install_repo | length > 0"
+  ansible.builtin.set_fact:
+    dnsdist_repo_name: "{{ dnsdist_remove_versioned_repo_files | ternary(dnsdist_install_repo_name, dnsdist_install_repo['name']) }}"
+    dnsdist_repo_regex: "{{ dnsdist_remove_versioned_repo_files | ternary(dnsdist_remove_versioned_repo_regex, dnsdist_install_repo_regex) }}"
+  tags:
+    - install
+    - repository
+
 - name: Setup repository
   ansible.builtin.include_tasks: "repo-{{ ansible_os_family }}.yml"
   when: dnsdist_install_repo | length > 0

tasks/repo-Debian.yml

@@ -1,12 +1,34 @@
 ---
+- name: Find repo and key files matching dnsdist_repo_regex
+  ansible.builtin.find:
+    paths:
+      - /etc/apt/sources.list.d/
+      - /etc/apt/trusted.gpg.d/
+      - /etc/apt/keyrings/
+    patterns: "{{ dnsdist_repo_regex }}"
+    use_regex: true
+  register: _dnsdist_version_suffixed_repo_files
+  tags:
+    - install
+    - repository
+
+- name: Remove found matching repo and key files
+  ansible.builtin.file:
+    path: "{{ item }}"
+    state: absent
+  loop: "{{ _dnsdist_version_suffixed_repo_files.files | map(attribute='path') | list }}"
+  tags:
+    - install
+    - repository
+
 - name: Install python3-debian (required by deb822_repository)
   ansible.builtin.package:
     name: python3-debian
     state: present
 
 - name: Add the dnsdist APT Repository (Deb822-style)
   ansible.builtin.deb822_repository:
-    name: "{{ dnsdist_install_repo['name'] }}"
+    name: "{{ dnsdist_repo_name }}"
     types: deb
     uris: "http://{{ dnsdist_install_repo['apt_repo_origin'] }}/{{ ansible_distribution | lower }}/"
     suites: "{{ ansible_distribution_release | lower }}-{{ dnsdist_install_repo['apt_version'] }}"

tasks/repo-RedHat.yml

@@ -1,4 +1,23 @@
 ---
+- name: Find repo files matching dnsdist_repo_regex
+  ansible.builtin.find:
+    paths: /etc/yum.repos.d/
+    patterns: "{{ dnsdist_repo_regex }}"
+    use_regex: true
+  register: _dnsdist_version_suffixed_repo_files
+  tags:
+    - install
+    - repository
+
+- name: Remove found matching repo and key files
+  ansible.builtin.file:
+    path: "{{ item }}"
+    state: absent
+  loop: "{{ _dnsdist_version_suffixed_repo_files.files | map(attribute='path') | list }}"
+  tags:
+    - install
+    - repository
+
 - name: Set up EPEL
   when: dnsdist_install_epel
   block:
@@ -32,8 +51,8 @@
 
 - name: Add the dnsdist YUM Repository
   ansible.builtin.yum_repository:
-    name: "{{ dnsdist_install_repo['name'] }}"
-    file: "{{ dnsdist_install_repo['name'] }}"
+    name: "{{ dnsdist_repo_name }}"
+    file: "{{ dnsdist_repo_name }}"
     description: PowerDNS dnsdist Repository
     baseurl: "{{ dnsdist_install_repo['yum_repo_baseurl'] }}"
     gpgkey: "{{ dnsdist_install_repo['gpg_key_url'] }}"
@@ -43,8 +62,8 @@
 
 - name: Add the dnsdist debug symbols YUM Repository
   ansible.builtin.yum_repository:
-    name: "{{ dnsdist_install_repo['name'] }}-debuginfo"
-    file: "{{ dnsdist_install_repo['name'] }}"
+    name: "{{ dnsdist_repo_name }}-debuginfo"
+    file: "{{ dnsdist_repo_name }}"
     description: PowerDNS dnsdist Repository - debug symbols
     baseurl: "{{ dnsdist_install_repo['yum_debug_symbols_repo_baseurl'] }}"
     gpgkey: "{{ dnsdist_install_repo['gpg_key_url'] }}"

vars/main.yml

@@ -6,7 +6,7 @@ _dnsdist_arch_map_debian:
   aarch64: arm64
   arm64: arm64
   armv8l: arm64
-_dnsdist_apt_architecture: "{{ _dnsdist_arch_map_debian.get(ansible_architecture | lower, 'amd64' ) }}"
+_dnsdist_apt_architecture: "{{ _dnsdist_arch_map_debian.get(ansible_architecture | lower, 'amd64') }}"
 
 dnsdist_powerdns_repo_master:
   apt_repo_origin: repo.powerdns.com