From: Guillaume Abrioux <gabrioux@redhat.com>
Date: Tue, 3 Mar 2020 18:01:27 +0000 (+0100)
Subject: tests: add more osd nodes in all_daemons scenario
X-Git-Tag: v6.0.0alpha1~24
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=9f0c6df94fabdfcd177603dfa72aadbbb5c6539a;p=ceph-ansible.git

tests: add more osd nodes in all_daemons scenario

This commit adds more osd nodes in all_daemons scenario in order to test
erasure pool creation.

Signed-off-by: Guillaume Abrioux <gabrioux@redhat.com>
---

diff --git a/tests/functional/all_daemons/container/hosts b/tests/functional/all_daemons/container/hosts
index b4882e58e..95e020424 100644
--- a/tests/functional/all_daemons/container/hosts
+++ b/tests/functional/all_daemons/container/hosts
@@ -9,6 +9,9 @@ mgr0
 [osds]
 osd0 osd_crush_location="{ 'root': 'HDD', 'rack': 'mon-rackkkk', 'pod': 'monpod', 'host': 'osd0' }"
 osd1 osd_crush_location="{ 'root': 'default', 'host': 'osd1' }"
+osd2 osd_crush_location="{ 'root': 'default', 'host': 'osd2' }"
+osd3 osd_crush_location="{ 'root': 'default', 'host': 'osd3' }"
+osd4 osd_crush_location="{ 'root': 'default', 'host': 'osd4' }"
 
 [mdss]
 mds0
@@ -32,4 +35,4 @@ rbd-mirror0
 iscsi-gw0
 
 [grafana-server]
-mon0
\ No newline at end of file
+mon0
diff --git a/tests/functional/all_daemons/container/vagrant_variables.yml b/tests/functional/all_daemons/container/vagrant_variables.yml
index fbb286109..78ed5e13c 100644
--- a/tests/functional/all_daemons/container/vagrant_variables.yml
+++ b/tests/functional/all_daemons/container/vagrant_variables.yml
@@ -5,7 +5,7 @@ docker: True
 
 # DEFINE THE NUMBER OF VMS TO RUN
 mon_vms: 3
-osd_vms: 2
+osd_vms: 5
 mds_vms: 3
 rgw_vms: 1
 nfs_vms: 0
diff --git a/tests/functional/all_daemons/hosts b/tests/functional/all_daemons/hosts
index f0793d95d..b986c3ef2 100644
--- a/tests/functional/all_daemons/hosts
+++ b/tests/functional/all_daemons/hosts
@@ -9,6 +9,9 @@ mgr0
 [osds]
 osd0 osd_crush_location="{ 'root': 'HDD', 'rack': 'mon-rackkkk', 'pod': 'monpod', 'host': 'osd0' }"
 osd1 osd_crush_location="{ 'root': 'default', 'host': 'osd1' }"
+osd2 osd_crush_location="{ 'root': 'default', 'host': 'osd2' }"
+osd3 osd_crush_location="{ 'root': 'default', 'host': 'osd3' }"
+osd4 osd_crush_location="{ 'root': 'default', 'host': 'osd4' }"
 
 [mdss]
 mds0
@@ -32,4 +35,4 @@ rbd-mirror0
 iscsi-gw0 ceph_repository="dev"
 
 [grafana-server]
-mon0
\ No newline at end of file
+mon0
diff --git a/tests/functional/all_daemons/vagrant_variables.yml b/tests/functional/all_daemons/vagrant_variables.yml
index 24824a664..3c4354d9a 100644
--- a/tests/functional/all_daemons/vagrant_variables.yml
+++ b/tests/functional/all_daemons/vagrant_variables.yml
@@ -5,7 +5,7 @@ docker: false
 
 # DEFINE THE NUMBER OF VMS TO RUN
 mon_vms: 3
-osd_vms: 2
+osd_vms: 5
 mds_vms: 3
 rgw_vms: 1
 nfs_vms: 0