]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
ceph-volume: include the ceph-facts role when needed during testing
authorAndrew Schoen <aschoen@redhat.com>
Wed, 12 Dec 2018 20:10:59 +0000 (14:10 -0600)
committerAlfredo Deza <adeza@redhat.com>
Thu, 3 Jan 2019 19:33:53 +0000 (14:33 -0500)
The ceph-ansible stable-3.2 branch does not have the ceph-facts role
but master does. We need to make sure to import this role only when
it's supported.

Signed-off-by: Andrew Schoen <aschoen@redhat.com>
(cherry picked from commit 569b4fb7b3894275a3b9f4ab603e32099301f9aa)

src/ceph-volume/ceph_volume/tests/functional/playbooks/deploy.yml

index 3564cf3cd1f4bb1f8f47026f260e839d9065fc71..d527211edeba3e3fd9b3d82f438c0cd3f2eea117 100644 (file)
   gather_facts: false
   become: True
   any_errors_fatal: true
-  roles:
-    - role: ceph-defaults
-      tags: ['ceph_update_config']
-    - role: ceph-handler
-    - role: ceph-common
   tasks:
+    - name: run ceph-defaults role
+      import_role:
+        name: ceph-defaults
+
+    # mimic and luminous are tested with the ceph-ansible branch
+    # stable-3.2 and this role is not available there
+    - name: run ceph-facts role
+      import_role:
+        name: ceph-facts
+      when:
+        - ceph_dev_branch not in ["mimic", "lumious"]
+
+    - name: run ceph-handler role
+      import_role:
+        name: ceph-handler
+
+    - name: run ceph-common role
+      import_role:
+        name: ceph-common
+
     - name: rsync ceph-volume to test nodes on centos
       synchronize:
         src: "{{ toxinidir}}/../../../../ceph_volume"