]> git.apps.os.sepia.ceph.com Git - ceph-ansible.git/commitdiff
site-container: don't skip ceph-container-common
authorDimitri Savineau <dsavinea@redhat.com>
Wed, 22 Jan 2020 19:45:38 +0000 (14:45 -0500)
committerGuillaume Abrioux <gabrioux@redhat.com>
Thu, 23 Jan 2020 15:27:31 +0000 (16:27 +0100)
On HCI environment the OSD and Client nodes are collocated. Because we
aren't running the ceph-container-common role on the client nodes except
the first one (for keyring purpose) then the ceph-role execution fails
due to undefined variables.

Closes: #4970
Closes: https://bugzilla.redhat.com/show_bug.cgi?id=1794195
Signed-off-by: Dimitri Savineau <dsavinea@redhat.com>
(cherry picked from commit 671b1aba3c7ca9eca8c630bc4ce13d6dc2e185c5)

site-container.yml.sample

index 1c2c922e40847796a32cd74d162746b1b3d9625b..098cce826a86d41d84f65aadf8dd21dfefad4040 100644 (file)
@@ -57,7 +57,7 @@
     - import_role:
         name: ceph-container-common
       tags: fetch_container_image
-      when: not (inventory_hostname in groups.get('clients', [])) or (inventory_hostname == groups.get('clients', [''])|first)
+      when: (group_names != ['clients']) or (inventory_hostname == groups.get('clients', [''])|first)
 
 - hosts: mons
   gather_facts: false