From: Alfredo Deza <adeza@redhat.com>
Date: Mon, 7 Jan 2019 20:15:21 +0000 (-0500)
Subject: ceph-volume tests/functional declare ceph-ansible roles instead of importing them
X-Git-Tag: v14.1.0~474^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=ad6b924e2bf3b06ec66eb5bc4fea065f5babc512;p=ceph.git

ceph-volume tests/functional declare ceph-ansible roles instead of importing them

Signed-off-by: Alfredo Deza <adeza@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 d527211edeba..f46fcb1d45ea 100644
--- a/src/ceph-volume/ceph_volume/tests/functional/playbooks/deploy.yml
+++ b/src/ceph-volume/ceph_volume/tests/functional/playbooks/deploy.yml
@@ -74,27 +74,12 @@
   gather_facts: false
   become: True
   any_errors_fatal: true
+  roles:
+    - ceph-defaults
+    - ceph-facts
+    - ceph-handler
+    - 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"