From da6d68c0423bc718cf768dc3e54753029c0d637b Mon Sep 17 00:00:00 2001 From: Andrew Schoen Date: Thu, 1 Dec 2016 16:48:06 -0600 Subject: [PATCH] tests: rename the directory for xenial_cluster Signed-off-by: Andrew Schoen --- .../ubuntu/16.04/{mon-osd-mds-rgw => cluster}/Vagrantfile | 0 .../ubuntu/16.04/{mon-osd-mds-rgw => cluster}/group_vars/all | 0 .../ubuntu/16.04/{mon-osd-mds-rgw => cluster}/group_vars/osds | 0 .../functional/ubuntu/16.04/{mon-osd-mds-rgw => cluster}/hosts | 0 .../ubuntu/16.04/{mon-osd-mds-rgw => cluster}/scenario.py | 0 .../16.04/{mon-osd-mds-rgw => cluster}/vagrant_variables.yml | 0 tox.ini | 2 +- 7 files changed, 1 insertion(+), 1 deletion(-) rename tests/functional/ubuntu/16.04/{mon-osd-mds-rgw => cluster}/Vagrantfile (100%) rename tests/functional/ubuntu/16.04/{mon-osd-mds-rgw => cluster}/group_vars/all (100%) rename tests/functional/ubuntu/16.04/{mon-osd-mds-rgw => cluster}/group_vars/osds (100%) rename tests/functional/ubuntu/16.04/{mon-osd-mds-rgw => cluster}/hosts (100%) rename tests/functional/ubuntu/16.04/{mon-osd-mds-rgw => cluster}/scenario.py (100%) rename tests/functional/ubuntu/16.04/{mon-osd-mds-rgw => cluster}/vagrant_variables.yml (100%) diff --git a/tests/functional/ubuntu/16.04/mon-osd-mds-rgw/Vagrantfile b/tests/functional/ubuntu/16.04/cluster/Vagrantfile similarity index 100% rename from tests/functional/ubuntu/16.04/mon-osd-mds-rgw/Vagrantfile rename to tests/functional/ubuntu/16.04/cluster/Vagrantfile diff --git a/tests/functional/ubuntu/16.04/mon-osd-mds-rgw/group_vars/all b/tests/functional/ubuntu/16.04/cluster/group_vars/all similarity index 100% rename from tests/functional/ubuntu/16.04/mon-osd-mds-rgw/group_vars/all rename to tests/functional/ubuntu/16.04/cluster/group_vars/all diff --git a/tests/functional/ubuntu/16.04/mon-osd-mds-rgw/group_vars/osds b/tests/functional/ubuntu/16.04/cluster/group_vars/osds similarity index 100% rename from tests/functional/ubuntu/16.04/mon-osd-mds-rgw/group_vars/osds rename to tests/functional/ubuntu/16.04/cluster/group_vars/osds diff --git a/tests/functional/ubuntu/16.04/mon-osd-mds-rgw/hosts b/tests/functional/ubuntu/16.04/cluster/hosts similarity index 100% rename from tests/functional/ubuntu/16.04/mon-osd-mds-rgw/hosts rename to tests/functional/ubuntu/16.04/cluster/hosts diff --git a/tests/functional/ubuntu/16.04/mon-osd-mds-rgw/scenario.py b/tests/functional/ubuntu/16.04/cluster/scenario.py similarity index 100% rename from tests/functional/ubuntu/16.04/mon-osd-mds-rgw/scenario.py rename to tests/functional/ubuntu/16.04/cluster/scenario.py diff --git a/tests/functional/ubuntu/16.04/mon-osd-mds-rgw/vagrant_variables.yml b/tests/functional/ubuntu/16.04/cluster/vagrant_variables.yml similarity index 100% rename from tests/functional/ubuntu/16.04/mon-osd-mds-rgw/vagrant_variables.yml rename to tests/functional/ubuntu/16.04/cluster/vagrant_variables.yml diff --git a/tox.ini b/tox.ini index 31f4b2090..1adbea8e0 100644 --- a/tox.ini +++ b/tox.ini @@ -22,7 +22,7 @@ changedir= # tests a 1 mon 1 osd xenial cluster using raw_multi_journal OSD scenario xenial_mon_osd: {toxinidir}/tests/functional/ubuntu/16.04/mon-osd # tests a 1 mon, 1 osd, 1 mds and 1 rgw xenial cluster using raw_multi_journal OSD scenario - xenial_cluster: {toxinidir}/tests/functional/ubuntu/16.04/mon-osd-mds-rgw + xenial_cluster: {toxinidir}/tests/functional/ubuntu/16.04/cluster # tests a 1 mon 1 osd centos7 cluster using journal_collocation OSD scenario journal_collocation: {toxinidir}/tests/functional/centos/7/journal-collocation # tests a 1 mon 1 osd centos7 cluster using dmcrypt_dedicated_journal OSD scenario -- 2.39.5