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 d527211edeba3e3fd9b3d82f438c0cd3f2eea117..f46fcb1d45ea10f78879449269fcb6068d3cbdd7 100644 (file)
--- 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"