From da13da67bc1e8ba062c61a716eea485ae462db48 Mon Sep 17 00:00:00 2001 From: Guillaume Abrioux Date: Wed, 13 Feb 2019 11:27:12 +0100 Subject: [PATCH] ceph-volume: update deploy.yml update deploy.yml accordingly with recent changes in ceph-ansible. Fixes: ceph/ceph-ansible#3602 Signed-off-by: Guillaume Abrioux --- .../tests/functional/playbooks/deploy.yml | 35 +++++++++++++------ 1 file changed, 25 insertions(+), 10 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 f46fcb1d45ea1..b334968a5a926 100644 --- a/src/ceph-volume/ceph_volume/tests/functional/playbooks/deploy.yml +++ b/src/ceph-volume/ceph_volume/tests/functional/playbooks/deploy.yml @@ -63,9 +63,20 @@ - ansible_distribution == 'Fedora' - ansible_distribution_major_version|int >= 23 - roles: - - ceph-defaults - - ceph-validate + - name: check if it is atomic host + stat: + path: /run/ostree-booted + register: stat_ostree + + - name: set_fact is_atomic + set_fact: + is_atomic: '{{ stat_ostree.stat.exists }}' + + tasks: + - import_role: + name: ceph-defaults + - import_role: + name: ceph-validate - hosts: - mons @@ -74,15 +85,19 @@ gather_facts: false become: True any_errors_fatal: true - roles: - - ceph-defaults - - ceph-facts - - ceph-handler - - ceph-common tasks: + - import_role: + name: ceph-defaults + - import_role: + name: ceph-facts + - import_role: + name: ceph-handler + - import_role: + name: ceph-common + - name: rsync ceph-volume to test nodes on centos synchronize: - src: "{{ toxinidir}}/../../../../ceph_volume" + src: "{{ toxinidir }}/../../../../ceph_volume" dest: "/usr/lib/python2.7/site-packages" use_ssh_args: true when: @@ -91,7 +106,7 @@ - name: rsync ceph-volume to test nodes on ubuntu synchronize: - src: "{{ toxinidir}}/../../../../ceph_volume" + src: "{{ toxinidir }}/../../../../ceph_volume" dest: "/usr/lib/python2.7/dist-packages" use_ssh_args: true when: