From 8f249304c2c6fd53302e5b180329fa4b8aae6d36 Mon Sep 17 00:00:00 2001 From: Andrew Schoen Date: Wed, 12 Dec 2018 14:10:59 -0600 Subject: [PATCH] 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 (cherry picked from commit 569b4fb7b3894275a3b9f4ab603e32099301f9aa) --- .../tests/functional/playbooks/deploy.yml | 25 +++++++++++++++---- 1 file changed, 20 insertions(+), 5 deletions(-) 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" -- 2.39.5