tests: leave an OSD node in default crush root

jewel used to create a default `rbd` pool in the default crush root
`default`, we need to have at least 1 osd to satisfy the PGs for this
created pool, otherwise the cluster will be in HEALTH_ERR state because
of `pgs stuck unclean`/`pgs stuck inactive`

Signed-off-by: Guillaume Abrioux <gabrioux@redhat.com>
(cherry picked from commit 578aa5c2d54a680912e4e015b6fb3dbbc94d4fd0)

diff --git a/tests/functional/centos/7/cluster/hosts b/tests/functional/centos/7/cluster/hosts
index 06c2eef384d13574c085901700273898a3fbf846..7a0cb15acdc9cad79771c88279175ba60a539ec2 100644 (file)
--- a/tests/functional/centos/7/cluster/hosts
+++ b/tests/functional/centos/7/cluster/hosts
@@ -8,6 +8,7 @@ ceph-mgr0
 
 [osds]
 ceph-osd0 osd_crush_location="{ 'root': 'HDD', 'rack': 'mon-rackkkk', 'pod': 'monpod', 'host': 'ceph-osd0' }"
+ceph-osd1 osd_crush_location="{ 'root': 'default', 'host': 'ceph-osd1' }"
 
 [mdss]
 ceph-mds0

diff --git a/tests/functional/centos/7/cluster/vagrant_variables.yml b/tests/functional/centos/7/cluster/vagrant_variables.yml
index 1b3c5f849c01b15c4fff7b9fc21b88dbe91f8b75..1e062066a78de35abe2722e48a158a645cd479e9 100644 (file)
--- a/tests/functional/centos/7/cluster/vagrant_variables.yml
+++ b/tests/functional/centos/7/cluster/vagrant_variables.yml
@@ -5,7 +5,7 @@ docker: false
 
 # DEFINE THE NUMBER OF VMS TO RUN
 mon_vms: 3
-osd_vms: 1
+osd_vms: 2
 mds_vms: 1
 rgw_vms: 1
 nfs_vms: 1