From e5ea2ece993bd54f50a8a7419321734ec03389f2 Mon Sep 17 00:00:00 2001 From: Guillaume Abrioux Date: Mon, 29 Nov 2021 10:48:23 +0100 Subject: [PATCH] adopt: fix ceph_origin and ceph_repository defaults This is overriding those variables because the precedence at the 'block var' level is greater than the group_vars/host_vars. Closes: https://bugzilla.redhat.com/show_bug.cgi?id=2026861 Signed-off-by: Guillaume Abrioux --- infrastructure-playbooks/cephadm-adopt.yml | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/infrastructure-playbooks/cephadm-adopt.yml b/infrastructure-playbooks/cephadm-adopt.yml index 51617d2cf..7b4adc5d8 100644 --- a/infrastructure-playbooks/cephadm-adopt.yml +++ b/infrastructure-playbooks/cephadm-adopt.yml @@ -147,10 +147,17 @@ - name: configure repository for installing cephadm when: containerized_deployment | bool - vars: - ceph_origin: repository - ceph_repository: community block: + - name: set_fact ceph_origin + set_fact: + ceph_origin: repository + when: ceph_origin == 'dummy' + + - name: set_fact ceph_repository + set_fact: + ceph_repository: community + when: ceph_repository == 'dummy' + - name: validate repository variables import_role: name: ceph-validate -- 2.39.5