]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph-ansible.git/commitdiff
rolling_update: enforce ceph-container-engine
authorDimitri Savineau <dsavinea@redhat.com>
Wed, 3 Feb 2021 22:39:49 +0000 (17:39 -0500)
committerGuillaume Abrioux <gabrioux@redhat.com>
Thu, 11 Mar 2021 12:52:21 +0000 (13:52 +0100)
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 <dsavinea@redhat.com>
(cherry picked from commit 48a456dc8c951d869c7745aa38fbe5327795eb65)

infrastructure-playbooks/rolling_update.yml

index 9bdef2530e2f1a11f6c520c90d4f5ac74259d8e0..c84397099a61bd63567fea6c2b08c447e587ac89 100644 (file)
     - 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