From: Alfredo Deza <adeza@redhat.com>
Date: Fri, 10 Nov 2017 18:18:07 +0000 (-0500)
Subject: ceph-volume tests.functional update lvm/tox.ini paths after moving it
X-Git-Tag: v13.0.1~236^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F18882%2Fhead;p=ceph.git

ceph-volume tests.functional update lvm/tox.ini paths after moving it

Signed-off-by: Alfredo Deza <adeza@redhat.com>
---

diff --git a/src/ceph-volume/ceph_volume/tests/functional/lvm/tox.ini b/src/ceph-volume/ceph_volume/tests/functional/lvm/tox.ini
index 6fda7dcc09c7..e9ca24991197 100644
--- a/src/ceph-volume/ceph_volume/tests/functional/lvm/tox.ini
+++ b/src/ceph-volume/ceph_volume/tests/functional/lvm/tox.ini
@@ -19,19 +19,21 @@ deps=
   testinfra==1.7.1
   pytest-xdist
 changedir=
-  centos7-filestore-create: {toxinidir}/centos7/create
-  xenial-filestore-create: {toxinidir}/xenial/create
-  xenial-bluestore-create: {toxinidir}/xenial/bluestore
-  centos7-bluestore-create: {toxinidir}/centos7/bluestore
+  centos7-filestore-create: {toxinidir}/centos7/filestore/create
+  centos7-bluestore-create: {toxinidir}/centos7/bluestore/create
+  xenial-filestore-create: {toxinidir}/xenial/filestore/create
+  xenial-bluestore-create: {toxinidir}/xenial/bluestore/create
   # TODO: these are placeholders for now, eventually we want to
   # test the prepare/activate workflow of ceph-volume as well
-  xenial-prepare_activate: {toxinidir}/xenial/prepare_activate
-  centos7-prepare_activate: {toxinidir}/xenial/prepare_activate
+  xenial-filestore-prepare_activate: {toxinidir}/xenial/filestore/prepare_activate
+  xenial-bluestore-prepare_activate: {toxinidir}/xenial/bluestore/prepare_activate
+  centos7-filestore-prepare_activate: {toxinidir}/xenial/filestore/prepare_activate
+  centos7-bluestore-prepare_activate: {toxinidir}/xenial/bluestore/prepare_activate
 commands=
   git clone -b {env:CEPH_ANSIBLE_BRANCH:master} --single-branch https://github.com/ceph/ceph-ansible.git {envdir}/tmp/ceph-ansible
 
   vagrant up --no-provision {posargs:--provider=virtualbox}
-  bash {toxinidir}/scripts/generate_ssh_config.sh {changedir}
+  bash {toxinidir}/../scripts/generate_ssh_config.sh {changedir}
 
   # create logical volumes to test with on the vms
   ansible-playbook -vv -i {changedir}/hosts {envdir}/tmp/ceph-ansible/tests/functional/lvm_setup.yml