From eae3463a9ea71487522b5f99dd9b140b1dbc4882 Mon Sep 17 00:00:00 2001 From: Andrew Schoen Date: Mon, 28 Nov 2016 15:05:48 -0600 Subject: [PATCH] tests: change xenial-cluster to use raw_multi_journal Signed-off-by: Andrew Schoen --- tests/functional/ubuntu/16.04/mon-osd-mds-rgw/group_vars/all | 3 ++- tox.ini | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/tests/functional/ubuntu/16.04/mon-osd-mds-rgw/group_vars/all b/tests/functional/ubuntu/16.04/mon-osd-mds-rgw/group_vars/all index da89c8993..9cb9f11ee 100644 --- a/tests/functional/ubuntu/16.04/mon-osd-mds-rgw/group_vars/all +++ b/tests/functional/ubuntu/16.04/mon-osd-mds-rgw/group_vars/all @@ -6,8 +6,9 @@ cluster_network: "192.168.6.0/24" journal_size: 100 devices: - '/dev/sdb' +raw_journal_devices: - '/dev/sdc' -journal_collocation: True +raw_multi_journal: True os_tuning_params: - { name: kernel.pid_max, value: 4194303 } - { name: fs.file-max, value: 26234859 } diff --git a/tox.ini b/tox.ini index a6806e2e8..bcbfec449 100644 --- a/tox.ini +++ b/tox.ini @@ -20,7 +20,7 @@ changedir= xenial-conf-tests: {toxinidir}/tests/functional/ubuntu/16.04/mon # 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 journal_collocation OSD scenario + # 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 # tests a 1 mon 1 osd centos7 cluster using journal_collocation OSD scenario journal-collocation: {toxinidir}/tests/functional/centos/7/journal-collocation