From: Andrew Schoen <aschoen@redhat.com>
Date: Wed, 12 Dec 2018 20:10:59 +0000 (-0600)
Subject: ceph-volume: include the ceph-facts role when needed during testing
X-Git-Tag: v14.1.0~624^2~2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=569b4fb7b3894275a3b9f4ab603e32099301f9aa;p=ceph.git

ceph-volume: include the ceph-facts role when needed during testing

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>
---

diff --git a/src/ceph-volume/ceph_volume/tests/functional/playbooks/deploy.yml b/src/ceph-volume/ceph_volume/tests/functional/playbooks/deploy.yml
index 3564cf3cd1f4b..d527211edeba3 100644
--- a/src/ceph-volume/ceph_volume/tests/functional/playbooks/deploy.yml
+++ b/src/ceph-volume/ceph_volume/tests/functional/playbooks/deploy.yml
@@ -74,12 +74,27 @@
   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"