tests: add multimds coverage

This commit makes the all_daemons scenario deploying 3 mds in order to
cover the multimds case.

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

diff --git a/tests/functional/all_daemons/container/group_vars/all b/tests/functional/all_daemons/container/group_vars/all
index f9582c12743060fdcb4f7fc0a73b3af1c171df40..9f672cc2663f0f8c53015f7821e879f688b08fd9 100644 (file)
--- a/tests/functional/all_daemons/container/group_vars/all
+++ b/tests/functional/all_daemons/container/group_vars/all
@@ -37,3 +37,4 @@ openstack_cinder_pool:
 openstack_pools:
   - "{{ openstack_glance_pool }}"
   - "{{ openstack_cinder_pool }}"
+mds_max_mds: 3
\ No newline at end of file

diff --git a/tests/functional/all_daemons/container/hosts b/tests/functional/all_daemons/container/hosts
index 3421926b5a2a929ba372edd85b823fcaef487d8a..e6ca5f0f210fce6b5bfaf5b55c59c405bb9f673b 100644 (file)
--- a/tests/functional/all_daemons/container/hosts
+++ b/tests/functional/all_daemons/container/hosts
@@ -12,6 +12,8 @@ osd1 osd_crush_location="{ 'root': 'default', 'host': 'osd1' }"
 
 [mdss]
 mds0
+mds1
+mds2
 
 [rgws]
 rgw0

diff --git a/tests/functional/all_daemons/container/vagrant_variables.yml b/tests/functional/all_daemons/container/vagrant_variables.yml
index ad8beaf5acb67127c11f63fd3d8cee79f7f08aa2..c95a7693adb5f7703629f4bf5d01c2d7727aaba6 100644 (file)
--- a/tests/functional/all_daemons/container/vagrant_variables.yml
+++ b/tests/functional/all_daemons/container/vagrant_variables.yml
@@ -6,7 +6,7 @@ docker: True
 # DEFINE THE NUMBER OF VMS TO RUN
 mon_vms: 3
 osd_vms: 2
-mds_vms: 1
+mds_vms: 3
 rgw_vms: 1
 nfs_vms: 1
 rbd_mirror_vms: 1

diff --git a/tests/functional/all_daemons/group_vars/all b/tests/functional/all_daemons/group_vars/all
index 4bd4fe2b902e70b080ddf6a4d34e5caaa996a2c0..6504f00082ad15a22b2686e1a52a8ffaf7755d68 100644 (file)
--- a/tests/functional/all_daemons/group_vars/all
+++ b/tests/functional/all_daemons/group_vars/all
@@ -30,4 +30,5 @@ openstack_cinder_pool:
   application: rbd
 openstack_pools:
   - "{{ openstack_glance_pool }}"
-  - "{{ openstack_cinder_pool }}"
\ No newline at end of file
+  - "{{ openstack_cinder_pool }}"
+mds_max_mds: 3
\ No newline at end of file

diff --git a/tests/functional/all_daemons/hosts b/tests/functional/all_daemons/hosts
index f225a9596605f3889b5096020bb0e0bddc606bfb..8f57cdb69ce40414c647eea06aaf34db411e9037 100644 (file)
--- a/tests/functional/all_daemons/hosts
+++ b/tests/functional/all_daemons/hosts
@@ -12,6 +12,8 @@ osd1 osd_crush_location="{ 'root': 'default', 'host': 'osd1' }"
 
 [mdss]
 mds0
+mds1
+mds2
 
 [rgws]
 rgw0

diff --git a/tests/functional/all_daemons/hosts-switch-to-containers b/tests/functional/all_daemons/hosts-switch-to-containers
index f64dbc692b9e7ddc995b3432cc35da4adcd60f0f..bfb82fc54c8bc6a0362ff70a3e835dfe7414ce8a 100644 (file)
--- a/tests/functional/all_daemons/hosts-switch-to-containers
+++ b/tests/functional/all_daemons/hosts-switch-to-containers
@@ -14,6 +14,8 @@ osd0
 
 [mdss]
 mds0
+mds1
+mds2
 
 [rgws]
 rgw0

diff --git a/tests/functional/all_daemons/hosts-ubuntu b/tests/functional/all_daemons/hosts-ubuntu
index 329d1f051efd2aef4b2d66e8cbf620240f66e859..922e4ba1e184bf899d4798e6a03ff0e639f46b5f 100644 (file)
--- a/tests/functional/all_daemons/hosts-ubuntu
+++ b/tests/functional/all_daemons/hosts-ubuntu
@@ -12,6 +12,8 @@ osd1 osd_crush_location="{ 'root': 'default', 'host': 'osd1' }"
 
 [mdss]
 mds0
+mds1
+mds2
 
 [rgws]
 rgw0

diff --git a/tests/functional/all_daemons/vagrant_variables.yml b/tests/functional/all_daemons/vagrant_variables.yml
index fb032384547db42ed9fb96b16c6ab0572d6647bb..e3ab3a63356f49833cacff90ad57c06b557f17da 100644 (file)
--- a/tests/functional/all_daemons/vagrant_variables.yml
+++ b/tests/functional/all_daemons/vagrant_variables.yml
@@ -6,7 +6,7 @@ docker: false
 # DEFINE THE NUMBER OF VMS TO RUN
 mon_vms: 3
 osd_vms: 2
-mds_vms: 1
+mds_vms: 3
 rgw_vms: 1
 nfs_vms: 1
 rbd_mirror_vms: 1

diff --git a/tox-update.ini b/tox-update.ini
index 229b345d6222b80089f2968f1651362fc7d2f487..6764b0407ee9f1ffcbf02bc160acb0056dc72824 100644 (file)
--- a/tox-update.ini
+++ b/tox-update.ini
@@ -62,6 +62,7 @@ commands=
       ceph_docker_image={env:CEPH_DOCKER_IMAGE:ceph/daemon} \
       ceph_docker_image_tag={env:CEPH_DOCKER_IMAGE_TAG:latest-jewel} \
       copy_admin_key={env:COPY_ADMIN_KEY:False} \
+      mds_max_mds=1 \
   "
 
   pip install -r {toxinidir}/tests/requirements.txt