From 9dad8fc201fdcfc3c79442c77b2bdc21d2a5be88 Mon Sep 17 00:00:00 2001 From: Guillaume Abrioux Date: Thu, 17 Oct 2019 16:20:22 +0200 Subject: [PATCH] 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 --- tests/functional/all_daemons/container/group_vars/all | 1 + tests/functional/all_daemons/container/hosts | 2 ++ tests/functional/all_daemons/container/vagrant_variables.yml | 2 +- tests/functional/all_daemons/group_vars/all | 3 ++- tests/functional/all_daemons/hosts | 2 ++ tests/functional/all_daemons/hosts-switch-to-containers | 2 ++ tests/functional/all_daemons/hosts-ubuntu | 2 ++ tests/functional/all_daemons/vagrant_variables.yml | 2 +- tox-update.ini | 1 + 9 files changed, 14 insertions(+), 3 deletions(-) diff --git a/tests/functional/all_daemons/container/group_vars/all b/tests/functional/all_daemons/container/group_vars/all index f9582c127..9f672cc26 100644 --- 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 3421926b5..e6ca5f0f2 100644 --- 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 ad8beaf5a..c95a7693a 100644 --- 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 4bd4fe2b9..6504f0008 100644 --- 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 f225a9596..8f57cdb69 100644 --- 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 f64dbc692..bfb82fc54 100644 --- 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 329d1f051..922e4ba1e 100644 --- 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 fb0323845..e3ab3a633 100644 --- 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 229b345d6..6764b0407 100644 --- 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 -- 2.39.5