tests: change centos7-cluster to use raw_multi_journal

Signed-off-by: Andrew Schoen <aschoen@redhat.com>

diff --git a/tests/functional/centos/7/mon-osd-mds-rgw/group_vars/all b/tests/functional/centos/7/mon-osd-mds-rgw/group_vars/all
index 73e37fe92b5955a626cdef553dd5cea08bcb28a0..2ac2dbd5e7eec37bdd578d8364f70c4278b11ed7 100644 (file)
--- a/tests/functional/centos/7/mon-osd-mds-rgw/group_vars/all
+++ b/tests/functional/centos/7/mon-osd-mds-rgw/group_vars/all
@@ -6,8 +6,9 @@ cluster_network: "192.168.2.0/24"
 journal_size: 100
 devices:
   - '/dev/sda'
+raw_journal_devices:
   - '/dev/sdb'
-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 bcbfec449a84bfbd8a97e47b48979e8ed41cc3c4..ae59c364eb01bce68b5d91bd79eb618a9dcc7f50 100644 (file)
--- a/tox.ini
+++ b/tox.ini
@@ -28,7 +28,7 @@ changedir=
   dmcrypt-journal: {toxinidir}/tests/functional/centos/7/dmcrypt-dedicated-journal
   # tests a 1 mon 1 osd centos7 cluster using dmcrypt_journal_collocation OSD scenario
   dmcrypt-journal-collocation: {toxinidir}/tests/functional/centos/7/dmcrypt-journal-collocation
-  # tests a 1 mon, 1 osd, 1 mds and 1 rgw centos7 cluster using journal_collocation OSD scenario
+  # tests a 1 mon, 1 osd, 1 mds and 1 rgw centos7 cluster using raw_multi_journal OSD scenario
   centos7-cluster: {toxinidir}/tests/functional/centos/7/mon-osd-mds-rgw
 commands=
   vagrant up --no-provision {posargs:--provider=virtualbox}