From: Alfredo Deza <adeza@redhat.com>
Date: Fri, 19 Jan 2018 16:08:25 +0000 (-0500)
Subject: ceph-volume tests.functional add dmcrypt support in tox.ini
X-Git-Tag: v12.2.3~27^2~7
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=558b5c62fcc1dd6ac7627e11523c60b0bfab3787;p=ceph.git

ceph-volume tests.functional add dmcrypt support in tox.ini

Signed-off-by: Alfredo Deza <adeza@redhat.com>
(cherry picked from commit d1ef5c487ba1ea868fd85b8c425986a2cf435519)
---

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 797138f7dd528..1a606677bfbca 100644
--- a/src/ceph-volume/ceph_volume/tests/functional/lvm/tox.ini
+++ b/src/ceph-volume/ceph_volume/tests/functional/lvm/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-envlist = {centos7,xenial}-{filestore,bluestore}-{create,prepare_activate}
+envlist = {centos7,xenial}-{filestore,bluestore}-{create,prepare_activate,dmcrypt}
 skipsdist = True
 
 [testenv]
@@ -19,10 +19,16 @@ deps=
   testinfra==1.7.1
   pytest-xdist
 changedir=
+  # plain/unencrypted
   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
+  # dmcrypt
+  centos7-filestore-dmcrypt: {toxinidir}/centos7/filestore/dmcrypt
+  centos7-bluestore-dmcrypt: {toxinidir}/centos7/bluestore/dmcrypt
+  xenial-filestore-dmcrypt: {toxinidir}/xenial/filestore/dmcrypt
+  xenial-bluestore-dmcrypt: {toxinidir}/xenial/bluestore/dmcrypt
   # TODO: these are placeholders for now, eventually we want to
   # test the prepare/activate workflow of ceph-volume as well
   xenial-filestore-prepare_activate: {toxinidir}/xenial/filestore/prepare_activate