From b2ecd92878025a4e682f41efa7e4c6ec377e8e0d Mon Sep 17 00:00:00 2001 From: Andrew Schoen Date: Mon, 20 Feb 2023 14:36:23 -0600 Subject: [PATCH] cephadm-preflight: only use $basearch for IBM yum repo community should still use noarch and $basearch Signed-off-by: Andrew Schoen (cherry picked from commit 0af37a989ac856b1f67eee4306c0057904e3c90c) --- cephadm-preflight.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/cephadm-preflight.yml b/cephadm-preflight.yml index d8b6e1c..9d5ab8b 100644 --- a/cephadm-preflight.yml +++ b/cephadm-preflight.yml @@ -60,6 +60,7 @@ description: "{{ 'Ceph Stable repo' if ceph_origin == 'community' else 'IBM Ceph repo' }}" 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 }}" + paths: "{{ [ 'noarch', '$basearch' ] if ceph_origin == 'community' else [ '$basearch' ] }}" - name: configure ceph repository key rpm_key: @@ -80,9 +81,7 @@ priority: '2' register: result until: result is succeeded - loop: - - "$basearch" - - "noarch" + loop: "{{ _ceph_repo.paths }}" - name: enable repo from shaman - dev when: ceph_origin == 'shaman'