tests: add mgr node for all_daemons scenario

add a monitor node to cover in the CI the case where mgrs and monitors
are not collocated

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 40c22385ba14b35a41b171cfca3a3f3548b3f363..1f2f0a4f1abfbd62d1630a4deddc35c9705d06f2 100644 (file)
--- a/tests/functional/all_daemons/container/hosts
+++ b/tests/functional/all_daemons/container/hosts
@@ -3,6 +3,9 @@ mon0 monitor_address=192.168.17.10
 mon1 monitor_interface="{{ 'eth1' if ansible_distribution == 'CentOS' else 'ens6' }}"
 mon2 monitor_address=192.168.17.12
 
+[mgrs]
+mgr0
+
 [osds]
 osd0 osd_crush_location="{ 'root': 'HDD', 'rack': 'mon-rackkkk', 'pod': 'monpod', 'host': 'osd0' }"
 osd1 osd_crush_location="{ 'root': 'default', 'host': 'osd1' }"

diff --git a/tests/functional/all_daemons/container/hosts-ubuntu b/tests/functional/all_daemons/container/hosts-ubuntu
index a2cd66e59559b3f3980ce9377ec85779f4aa594c..001a3981dda39732afbd87b7de160080a5ef20fb 100644 (file)
--- a/tests/functional/all_daemons/container/hosts-ubuntu
+++ b/tests/functional/all_daemons/container/hosts-ubuntu
@@ -3,6 +3,9 @@ mon0 monitor_address=192.168.17.10
 mon1 monitor_interface="{{ 'eth1' if ansible_distribution == 'CentOS' else 'ens6' }}"
 mon2 monitor_address=192.168.17.12
 
+[mgrs]
+mgr0
+
 [osds]
 osd0 osd_crush_location="{ 'root': 'HDD', 'rack': 'mon-rackkkk', 'pod': 'monpod', 'host': 'osd0' }"
 osd1 osd_crush_location="{ 'root': 'default', 'host': 'osd1' }"

diff --git a/tests/functional/all_daemons/container/vagrant_variables.yml b/tests/functional/all_daemons/container/vagrant_variables.yml
index 78166da85e7ed3ca79b29facd6660dd6b3d5a5cd..b7df03dff15d5ae70e3203900c4336e8ad98c265 100644 (file)
--- a/tests/functional/all_daemons/container/vagrant_variables.yml
+++ b/tests/functional/all_daemons/container/vagrant_variables.yml
@@ -12,7 +12,7 @@ nfs_vms: 0
 rbd_mirror_vms: 1
 client_vms: 2
 iscsi_gw_vms: 1
-mgr_vms: 0
+mgr_vms: 1
 
 # SUBNETS TO USE FOR THE VMS
 public_subnet: 192.168.17

diff --git a/tests/functional/all_daemons/hosts b/tests/functional/all_daemons/hosts
index 06564f9a315280fdbe6c516030e86fa14c85733e..c1e8fa976b1b107bdc43d06ebbb307dd734360f3 100644 (file)
--- a/tests/functional/all_daemons/hosts
+++ b/tests/functional/all_daemons/hosts
@@ -3,6 +3,9 @@ mon0 monitor_address=192.168.1.10
 mon1 monitor_interface="{{ 'eth1' if ansible_distribution == 'CentOS' else 'ens6' }}"
 mon2 monitor_address=192.168.1.12
 
+[mgrs]
+mgr0
+
 [osds]
 osd0 osd_crush_location="{ 'root': 'HDD', 'rack': 'mon-rackkkk', 'pod': 'monpod', 'host': 'osd0' }"
 osd1 osd_crush_location="{ 'root': 'default', 'host': 'osd1' }"

diff --git a/tests/functional/all_daemons/hosts-switch-to-containers b/tests/functional/all_daemons/hosts-switch-to-containers
index c95d9d2f19977a56da8393ff86cd04077d634b08..4fb943738f6ed4e5e985c49f3fb8562fec05eb76 100644 (file)
--- a/tests/functional/all_daemons/hosts-switch-to-containers
+++ b/tests/functional/all_daemons/hosts-switch-to-containers
@@ -6,6 +6,9 @@ mon0 monitor_address=192.168.1.10
 mon1 monitor_interface="{{ 'eth1' if ansible_distribution == 'CentOS' else 'ens6' }}"
 mon2 monitor_address=192.168.1.12
 
+[mgrs]
+mgr0
+
 [osds]
 osd0
 

diff --git a/tests/functional/all_daemons/hosts-ubuntu b/tests/functional/all_daemons/hosts-ubuntu
index dff4a61a56e5df393c560b6d26717dbd9e3b622b..073cde5f668710cc7bbf3d1e88a04e6e4be5bc9d 100644 (file)
--- a/tests/functional/all_daemons/hosts-ubuntu
+++ b/tests/functional/all_daemons/hosts-ubuntu
@@ -3,6 +3,9 @@ mon0 monitor_address=192.168.1.10
 mon1 monitor_interface=ens6
 mon2 monitor_address=192.168.1.12
 
+[mgrs]
+mgr0
+
 [osds]
 osd0 osd_crush_location="{ 'root': 'HDD', 'rack': 'mon-rackkkk', 'pod': 'monpod', 'host': 'osd0' }"
 osd1 osd_crush_location="{ 'root': 'default', 'host': 'osd1' }"

diff --git a/tests/functional/all_daemons/vagrant_variables.yml b/tests/functional/all_daemons/vagrant_variables.yml
index c1301ed307eff76ed442b20fa84fa93a13002b75..a2181a87030d50919f429673d6ba9ef30db1b2f2 100644 (file)
--- a/tests/functional/all_daemons/vagrant_variables.yml
+++ b/tests/functional/all_daemons/vagrant_variables.yml
@@ -12,7 +12,7 @@ nfs_vms: 0
 rbd_mirror_vms: 1
 client_vms: 2
 iscsi_gw_vms: 1
-mgr_vms: 0
+mgr_vms: 1
 
 # INSTALL SOURCE OF CEPH
 # valid values are 'stable' and 'dev'