From 8f26ffdbacf909c758d598f6da3f16b7013e3222 Mon Sep 17 00:00:00 2001 From: Dimitri Savineau Date: Wed, 3 Feb 2021 17:39:49 -0500 Subject: [PATCH] rolling_update: enforce ceph-container-engine When running the rolling_update.yml playbook and adding the dashboard component in the same time then the requirement (like container packages) aren't installed. This could lead to a failure in case of using authentication on the container registry because the playbook will try to login on the registry but podman/docker aren't yet installed. Closes: https://bugzilla.redhat.com/show_bug.cgi?id=1903504 Closes: https://bugzilla.redhat.com/show_bug.cgi?id=1918650 Signed-off-by: Dimitri Savineau (cherry picked from commit 48a456dc8c951d869c7745aa38fbe5327795eb65) --- infrastructure-playbooks/rolling_update.yml | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/infrastructure-playbooks/rolling_update.yml b/infrastructure-playbooks/rolling_update.yml index 9bdef2530..c84397099 100644 --- a/infrastructure-playbooks/rolling_update.yml +++ b/infrastructure-playbooks/rolling_update.yml @@ -91,12 +91,18 @@ - import_role: name: ceph-validate + - import_role: + name: ceph-container-engine + when: + - (group_names != ['clients']) or (inventory_hostname == groups.get('clients', [''])|first) + - (containerized_deployment | bool) or (dashboard_enabled | bool) + - import_role: name: ceph-container-common tasks_from: registry when: - (group_names != ['clients']) or (inventory_hostname == groups.get('clients', [''])|first) - - containerized_deployment | bool + - (containerized_deployment | bool) or (dashboard_enabled | bool) - ceph_docker_registry_auth | bool - name: set_fact rolling_update -- 2.39.5