From a55e58487f6d91858f0deb85ae8ef4ed0a295df0 Mon Sep 17 00:00:00 2001
From: Ryan Taylor <1686627+rptaylor@users.noreply.github.com>
Date: Fri, 6 Dec 2024 13:07:28 -0800
Subject: [PATCH] switch from yum to dnf

---
 tasks/main.yml               |  2 +-
 tasks/{yum.yml => repos.yml} | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)
 rename tasks/{yum.yml => repos.yml} (82%)

diff --git a/tasks/main.yml b/tasks/main.yml
index 4fb9fcd..bf6cdcc 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -7,7 +7,7 @@
     - yum
 
 - { import_tasks: keys.yml, tags: ['cvmfs', 'keys'] }
-- { import_tasks: yum.yml, tags: ['cvmfs', 'yum'] }
+- { import_tasks: repos.yml, tags: ['cvmfs', 'repos'] }
 - { import_tasks: users.yml, tags: ['cvmfs', 'users'] }
 - { import_tasks: storage.yml, tags: ['cvmfs', 'storage'], when: cvmfs_client_configure_storage | bool }
 - { import_tasks: packages.yml, tags: ['cvmfs', 'packages'] }
diff --git a/tasks/yum.yml b/tasks/repos.yml
similarity index 82%
rename from tasks/yum.yml
rename to tasks/repos.yml
index 02daba3..b8fc4b5 100644
--- a/tasks/yum.yml
+++ b/tasks/repos.yml
@@ -1,19 +1,19 @@
 ---
 
-# Target hosts will need internet access anyway to install the actual packages via yum, so we might as well
-# install the yum config from the internet as well - if a version is not already installed. 
+# Target hosts will need internet access anyway to install the actual packages, so we might as well
+# install the config from the internet as well - if a version is not already installed. 
 # There is no benefit to abstracting this with the yum_repository module, and doing so would break idempotence
 # because these packages update themselves via their own yum repositories.
 
 - name: Install CernVM yum repository
-  yum:
+  ansible.builtin.dnf:
     name: https://ecsft.cern.ch/dist/cvmfs/cvmfs-release/cvmfs-release-latest.noarch.rpm
     state: present
     validate_certs: yes
   when: ansible_facts.packages['cvmfs-release'] is not defined
 
 - name: Install Compute Canada yum repository
-  yum:
+  ansible.builtin.dnf:
     name: https://package.computecanada.ca/yum/cc-cvmfs-public/prod/RPM/computecanada-release-latest.noarch.rpm
     state: present
     validate_certs: yes
@@ -22,7 +22,7 @@
     - ansible_facts.packages['computecanada-release'] is not defined
 
 - name: Install other prerequisite packages
-  yum:
+  ansible.builtin.dnf:
     name: [ 'lvm2' ]
   when: cvmfs_client_configure_storage | bool