From 31bd5e08a666f63daff5ec91f476a008c5f3b3f0 Mon Sep 17 00:00:00 2001 From: Dimitri Savineau Date: Fri, 2 Aug 2019 11:48:32 -0400 Subject: [PATCH] Revert "tests: disable nfs-ganesha deployment" This reverts commit 83940e624bc4faf6bc7bb1a7637711556d6b3e8c. Because nfs-ganesha@master (2.9-dev) build has been fixed by [1] then we can test nfs-ganesha in the CI for master/octopus. [1] https://github.com/ceph/ceph-build/pull/1346 Signed-off-by: Dimitri Savineau --- tests/functional/all_daemons/container/hosts | 4 ++-- tests/functional/all_daemons/hosts | 4 ++-- tox-update.ini | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/tests/functional/all_daemons/container/hosts b/tests/functional/all_daemons/container/hosts index 056563a6f..d3b73e10f 100644 --- a/tests/functional/all_daemons/container/hosts +++ b/tests/functional/all_daemons/container/hosts @@ -16,8 +16,8 @@ mds0 [rgws] rgw0 -#[nfss] -#nfs0 +[nfss] +nfs0 [clients] client0 diff --git a/tests/functional/all_daemons/hosts b/tests/functional/all_daemons/hosts index 0bc619545..29f84c79b 100644 --- a/tests/functional/all_daemons/hosts +++ b/tests/functional/all_daemons/hosts @@ -20,8 +20,8 @@ rgw0 client0 client1 -#[nfss] -#nfs0 +[nfss] +nfs0 [rbdmirrors] rbd-mirror0 diff --git a/tox-update.ini b/tox-update.ini index e960b90c4..067dc8aaa 100644 --- a/tox-update.ini +++ b/tox-update.ini @@ -56,7 +56,7 @@ commands= ansible-playbook -vv -i {changedir}/{env:INVENTORY} {envdir}/tmp/ceph-ansible/tests/functional/lvm_setup.yml --extra-vars "osd_scenario=lvm" # deploy the cluster - ansible-playbook -vv -i {envdir}/tmp/ceph-ansible/tests/functional/all_daemons{env:CONTAINER_DIR:}/{env:INVENTORY} {envdir}/tmp/ceph-ansible/{env:PLAYBOOK:site.yml.sample} --limit 'all:!nfs0' --extra-vars "\ + ansible-playbook -vv -i {envdir}/tmp/ceph-ansible/tests/functional/all_daemons{env:CONTAINER_DIR:}/{env:INVENTORY} {envdir}/tmp/ceph-ansible/{env:PLAYBOOK:site.yml.sample} --extra-vars "\ delegate_facts_host={env:DELEGATE_FACTS_HOST:True} \ fetch_directory={env:FETCH_DIRECTORY:{changedir}/fetch} \ ceph_stable_release={env:CEPH_STABLE_RELEASE:mimic} \