Merge "Improve handling of ceph_pkg_source changing"

tasks/ceph_preinstall_apt.yml

@@ -19,6 +19,8 @@
   ansible.builtin.assert:
     that: _repo_check | length == 0
     fail_msg: "The following repository definitions must be updated to deb822 format {{ _repo_check }}"
+  when:
+    - ceph_pkg_source == 'ceph'
 
 # NOTE(jrosser) remove this task for the 2025.2 release
 - name: Find legacy repository files

tasks/ceph_preinstall_dnf.yml

@@ -43,8 +43,6 @@
   with_items: "{{ ceph_gpg_keys }}"
   loop_control:
     loop_var: key
-  when:
-    - ceph_pkg_source == 'ceph'
   register: _add_ceph_keys
   until: _add_ceph_keys is success
   retries: 5
@@ -63,8 +61,6 @@
     priority: "{{ item.priority | default(omit) }}"
     state: "{{ item.enabled | default('present') }}"
   with_items: "{{ ceph_repos }}"
-  when:
-    - ansible_facts['pkg_mgr'] == 'dnf'
   register: install_repo
   until: install_repo  is success
   retries: 5

tasks/main.yml

@@ -43,8 +43,6 @@
 
 - name: Including ceph_preinstall tasks
   include_tasks: "ceph_preinstall_{{ ansible_facts['pkg_mgr'] }}.yml"
-  when:
-    - ceph_pkg_source != 'distro'
   args:
     apply:
       tags: