From 7fd92348bb5b0785fdc721d78b9c30b00346a509 Mon Sep 17 00:00:00 2001 From: Guillaume Abrioux Date: Tue, 26 Feb 2019 12:33:03 +0100 Subject: [PATCH] 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 --- tests/functional/all_daemons/container/hosts | 3 +++ tests/functional/all_daemons/container/hosts-ubuntu | 3 +++ tests/functional/all_daemons/container/vagrant_variables.yml | 2 +- tests/functional/all_daemons/hosts | 3 +++ tests/functional/all_daemons/hosts-switch-to-containers | 3 +++ tests/functional/all_daemons/hosts-ubuntu | 3 +++ tests/functional/all_daemons/vagrant_variables.yml | 2 +- 7 files changed, 17 insertions(+), 2 deletions(-) diff --git a/tests/functional/all_daemons/container/hosts b/tests/functional/all_daemons/container/hosts index 40c22385b..1f2f0a4f1 100644 --- 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 a2cd66e59..001a3981d 100644 --- 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 78166da85..b7df03dff 100644 --- 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 06564f9a3..c1e8fa976 100644 --- 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 c95d9d2f1..4fb943738 100644 --- 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 dff4a61a5..073cde5f6 100644 --- 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 c1301ed30..a2181a870 100644 --- 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'