]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph-ansible.git/commitdiff
container: run engine/common roles on first client
authorDimitri Savineau <dsavinea@redhat.com>
Thu, 10 Sep 2020 15:27:37 +0000 (11:27 -0400)
committerDimitri Savineau <savineau.dimitri@gmail.com>
Thu, 10 Sep 2020 17:19:44 +0000 (13:19 -0400)
We already do this in the site-container.yml playbook because we don't
need docker/podman installed on all client nodes and having the
container image only on the first client node.

Signed-off-by: Dimitri Savineau <dsavinea@redhat.com>
dashboard.yml
infrastructure-playbooks/rolling_update.yml

index e647a8e63a3ff72f92fed48f07cc78b8eacc173c..d772fad53d546c5caa2b1731762fc88f6dfb184b 100644 (file)
       tags: ['ceph_update_config']
     - import_role:
         name: ceph-container-engine
+      when: (group_names != ['clients']) or (inventory_hostname == groups.get('clients', [''])|first)
     - import_role:
         name: ceph-container-common
         tasks_from: registry
       when:
+        - (group_names != ['clients']) or (inventory_hostname == groups.get('clients', [''])|first)
         - not containerized_deployment | bool
         - ceph_docker_registry_auth | bool
     - import_role:
index 5bf8f9f89e20e58c8918d7f715830253c05e4f8c..5382f4c67ece5bf0b329ce33011e5955999804ec 100644 (file)
     - import_role:
         name: ceph-infra
 
+    - import_role:
+        name: ceph-validate
+
     - import_role:
         name: ceph-container-common
         tasks_from: registry
       when:
+        - (group_names != ['clients']) or (inventory_hostname == groups.get('clients', [''])|first)
         - containerized_deployment | bool
         - ceph_docker_registry_auth | bool
 
-    - import_role:
-        name: ceph-validate
-
     - set_fact: rolling_update=true
 
 - name: upgrade ceph mon cluster
       when: not containerized_deployment | bool
     - import_role:
         name: ceph-container-common
-      when: containerized_deployment | bool
+      when:
+        - (group_names != ['clients']) or (inventory_hostname == groups.get('clients', [''])|first)
+        - containerized_deployment | bool
     - import_role:
         name: ceph-config
     - import_role: