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/infrastructure-playbooks/rolling_update.yml b/infrastructure-playbooks/rolling_update.yml
index e971de8179f659c44f202312ea00e62b0e524234..4d42e5afdb00bb7026b733fcea1264be12738754 100644 (file)
--- a/infrastructure-playbooks/rolling_update.yml
+++ b/infrastructure-playbooks/rolling_update.yml
@@ -588,6 +588,15 @@
         name: ceph-mds@{{ hostvars[item]['ansible_hostname'] }}
         state: stopped
         enabled: no
+      delegate_to: "{{ item }}"
+      with_items: "{{ groups['standby_mdss'] }}"
+      when: groups['standby_mdss'] | default([]) | length > 0
+
+    # dedicated task for masking systemd unit
+    # somehow, having a single task doesn't work in containerized context
+    - name: mask systemd units for standby ceph mds
+      systemd:
+        name: ceph-mds@{{ hostvars[item]['ansible_hostname'] }}
         masked: yes
       delegate_to: "{{ item }}"
       with_items: "{{ groups['standby_mdss'] }}"

diff --git a/tests/functional/all_daemons/container/group_vars/all b/tests/functional/all_daemons/container/group_vars/all
index d1eb1b582a99da87af2268083d7787c37a2ba6c4..96da0ed86dd4fd2f918d60508104140b6441733c 100644 (file)
--- a/tests/functional/all_daemons/container/group_vars/all
+++ b/tests/functional/all_daemons/container/group_vars/all
@@ -39,4 +39,5 @@ openstack_pools:
   - "{{ openstack_cinder_pool }}"
 docker_pull_timeout: 600s
 handler_health_mon_check_delay: 10
-handler_health_osd_check_delay: 10
\ No newline at end of file
+handler_health_osd_check_delay: 10
+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 d3b73e10fd1d00a7e3c14158d8967688babe6576..06596f0818880795a178d6a360bcedbf2534c4d9 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/hosts-ubuntu b/tests/functional/all_daemons/container/hosts-ubuntu
index 7a8fc4092372023b3b604f9883730336859d5a93..5e22f90e3b1bf37cb9f9e0ead82897a1cd962975 100644 (file)
--- a/tests/functional/all_daemons/container/hosts-ubuntu
+++ b/tests/functional/all_daemons/container/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/container/vagrant_variables.yml b/tests/functional/all_daemons/container/vagrant_variables.yml
index e1f0e01c1ff291d6aecc0f617a431106f2f468fc..c49adaf9044245b2a38c3a9f668647cfaee45dd1 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
 grafana_server_vms: 0

diff --git a/tests/functional/all_daemons/group_vars/all b/tests/functional/all_daemons/group_vars/all
index 7a79329a3704fe6dd53331c7ca658659af082f35..f91c8b10fafd8138e9a3b1451a253fa84269140d 100644 (file)
--- a/tests/functional/all_daemons/group_vars/all
+++ b/tests/functional/all_daemons/group_vars/all
@@ -33,3 +33,4 @@ openstack_pools:
   - "{{ openstack_cinder_pool }}"
 handler_health_mon_check_delay: 10
 handler_health_osd_check_delay: 10
+mds_max_mds: 3

diff --git a/tests/functional/all_daemons/hosts b/tests/functional/all_daemons/hosts
index 29f84c79b4a5039790695f8a52d89739e754222a..44e193083b7e81aa870e88741c0c9438676fe3d3 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 4c8af90009e7462991ad0a07798769e7e4c92c6a..8c3aed16a1cf8f48d4f4871ec75cbf0aa73c220a 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 550130871736b90b7ff5810b6bc08a9f827c779b..1d84070a0e1f540a28b6ab4c869780aab12dab85 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 31c5c040a0a039190dfeb6c27c8e669c2e7778fe..0062ac71e59b91cb426d63729bf8efd60e610e4b 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
 grafana_server_vms: 0