]> git.apps.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>
Wed, 10 Feb 2021 07:17:11 +0000 (08:17 +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>
infrastructure-playbooks/rolling_update.yml

index e02219fa11e693e50064a42e78478b231d1562e4..76b80f59071be5aba013bfb98cf7953297b1e27b 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