Merge pull request #208 from ceph/mergify/bp/quincy/pr-206

preflight: generalize repo and key task names (backport #206)

ceph_defaults/defaults/main.yml

@@ -2,13 +2,13 @@
 ceph_origin: community
 ceph_dev_branch: main
 ceph_dev_sha1: latest
-ceph_rhcs_version: 5
-ceph_ibm_version: 5
+ceph_rhcs_version: 6
+ceph_ibm_version: 6
 ceph_mirror: https://download.ceph.com
 ceph_stable_key: https://download.ceph.com/keys/release.asc
 ceph_community_repo_baseurl: "{{ ceph_mirror }}/rpm-{{ ceph_release }}/el{{ ansible_facts['distribution_major_version'] }}/"
 ceph_ibm_repo_baseurl: "https://public.dhe.ibm.com/ibmdl/export/pub/storage/ceph/{{ ceph_ibm_version }}/rhel{{ ansible_facts['distribution_major_version'] }}/"
-ceph_ibm_key: https://public.dhe.ibm.com/ibmdl/export/pub/storage/ceph/5/rhel8/ibm-key.asc
+ceph_ibm_key: https://public.dhe.ibm.com/ibmdl/export/pub/storage/ceph/{{ ceph_ibm_version }}/rhel{{ ansible_facts['distribution_major_version'] }}/ibm-key.asc
 ceph_release: quincy
 upgrade_ceph_packages: false
 ceph_pkgs:

cephadm-preflight.yml

@@ -49,7 +49,7 @@
                 - rhceph-4-osd-for-rhel-8-{{ ansible_facts['architecture'] }}-rpms
               when: ansible_facts['distribution_major_version'] | int == 8
 
-        - name: enable repo from download.ceph.com
+        - name: enable ceph package repositories
           when: ceph_origin in ['community', 'ibm']
           block:
             - name: set_fact _ceph_repo
@@ -60,7 +60,7 @@
                   rpm_key: "{{ ceph_stable_key if ceph_origin == 'community' else ceph_ibm_key }}"
                   baseurl: "{{ ceph_community_repo_baseurl if ceph_origin == 'community' else ceph_ibm_repo_baseurl }}"
 
-            - name: configure ceph community repository stable key
+            - name: configure ceph repository key
               rpm_key:
                 key: "{{ _ceph_repo.rpm_key }}"
                 state: present