From c265180158f776ffec67ad2b24e2d73777764ef0 Mon Sep 17 00:00:00 2001 From: Guillaume Abrioux Date: Mon, 4 Sep 2017 23:58:56 +0200 Subject: [PATCH] tests: Add mgr node for all scenarios With Luminous we need to have mgr daemon. This commit adds an mgr daemon for all scenarios. Signed-off-by: Guillaume Abrioux --- tests/functional/centos/7/bluestore/hosts | 2 +- tests/functional/centos/7/bluestore/vagrant_variables.yml | 2 +- tests/functional/centos/7/bs-crypt-ded-jrn/hosts | 3 +++ tests/functional/centos/7/bs-crypt-jrn-col/hosts | 3 +++ tests/functional/centos/7/bs-dock-crypt-jrn-col/hosts | 3 +++ tests/functional/centos/7/bs-dock-ded-jrn/hosts | 3 +++ tests/functional/centos/7/bs-docker/hosts | 2 +- tests/functional/centos/7/bs-docker/vagrant_variables.yml | 2 +- tests/functional/centos/7/bs-jrn-col/hosts | 3 +++ tests/functional/centos/7/crypt-ded-jrn/hosts | 2 +- tests/functional/centos/7/crypt-ded-jrn/vagrant_variables.yml | 2 +- tests/functional/centos/7/crypt-jrn-col/hosts | 3 +++ tests/functional/centos/7/docker-crypt-jrn-col/hosts | 3 +++ tests/functional/centos/7/docker-ded-jrn/hosts | 3 +++ tests/functional/centos/7/jrn-col/hosts | 3 +++ tests/functional/centos/7/lvm-osds/hosts | 3 +++ 16 files changed, 36 insertions(+), 6 deletions(-) diff --git a/tests/functional/centos/7/bluestore/hosts b/tests/functional/centos/7/bluestore/hosts index 008f2cb56..ea51342dd 100644 --- a/tests/functional/centos/7/bluestore/hosts +++ b/tests/functional/centos/7/bluestore/hosts @@ -16,4 +16,4 @@ rgw0 client0 [mgrs] -mgr0 +mon0 diff --git a/tests/functional/centos/7/bluestore/vagrant_variables.yml b/tests/functional/centos/7/bluestore/vagrant_variables.yml index 576ef0034..ded9c1540 100644 --- a/tests/functional/centos/7/bluestore/vagrant_variables.yml +++ b/tests/functional/centos/7/bluestore/vagrant_variables.yml @@ -12,7 +12,7 @@ nfs_vms: 0 rbd_mirror_vms: 0 client_vms: 1 iscsi_gw_vms: 0 -mgr_vms: 1 +mgr_vms: 0 # Deploy RESTAPI on each of the Monitors restapi: true diff --git a/tests/functional/centos/7/bs-crypt-ded-jrn/hosts b/tests/functional/centos/7/bs-crypt-ded-jrn/hosts index f6a265ab3..e1c1de6f8 100644 --- a/tests/functional/centos/7/bs-crypt-ded-jrn/hosts +++ b/tests/functional/centos/7/bs-crypt-ded-jrn/hosts @@ -3,3 +3,6 @@ mon0 [osds] osd0 + +[mgrs] +mon0 diff --git a/tests/functional/centos/7/bs-crypt-jrn-col/hosts b/tests/functional/centos/7/bs-crypt-jrn-col/hosts index f6a265ab3..e1c1de6f8 100644 --- a/tests/functional/centos/7/bs-crypt-jrn-col/hosts +++ b/tests/functional/centos/7/bs-crypt-jrn-col/hosts @@ -3,3 +3,6 @@ mon0 [osds] osd0 + +[mgrs] +mon0 diff --git a/tests/functional/centos/7/bs-dock-crypt-jrn-col/hosts b/tests/functional/centos/7/bs-dock-crypt-jrn-col/hosts index f6a265ab3..e1c1de6f8 100644 --- a/tests/functional/centos/7/bs-dock-crypt-jrn-col/hosts +++ b/tests/functional/centos/7/bs-dock-crypt-jrn-col/hosts @@ -3,3 +3,6 @@ mon0 [osds] osd0 + +[mgrs] +mon0 diff --git a/tests/functional/centos/7/bs-dock-ded-jrn/hosts b/tests/functional/centos/7/bs-dock-ded-jrn/hosts index f6a265ab3..e1c1de6f8 100644 --- a/tests/functional/centos/7/bs-dock-ded-jrn/hosts +++ b/tests/functional/centos/7/bs-dock-ded-jrn/hosts @@ -3,3 +3,6 @@ mon0 [osds] osd0 + +[mgrs] +mon0 diff --git a/tests/functional/centos/7/bs-docker/hosts b/tests/functional/centos/7/bs-docker/hosts index 2d684367d..1a731a82c 100644 --- a/tests/functional/centos/7/bs-docker/hosts +++ b/tests/functional/centos/7/bs-docker/hosts @@ -13,4 +13,4 @@ mds0 rgw0 [mgrs] -mgr0 +mon0 diff --git a/tests/functional/centos/7/bs-docker/vagrant_variables.yml b/tests/functional/centos/7/bs-docker/vagrant_variables.yml index 5c4d1081f..38faaa888 100644 --- a/tests/functional/centos/7/bs-docker/vagrant_variables.yml +++ b/tests/functional/centos/7/bs-docker/vagrant_variables.yml @@ -12,7 +12,7 @@ nfs_vms: 0 rbd_mirror_vms: 1 client_vms: 0 iscsi_gw_vms: 0 -mgr_vms: 1 +mgr_vms: 0 # Deploy RESTAPI on each of the Monitors restapi: true diff --git a/tests/functional/centos/7/bs-jrn-col/hosts b/tests/functional/centos/7/bs-jrn-col/hosts index 89721c03e..6085b1d2f 100644 --- a/tests/functional/centos/7/bs-jrn-col/hosts +++ b/tests/functional/centos/7/bs-jrn-col/hosts @@ -3,3 +3,6 @@ mon0 monitor_interface=eth1 [osds] osd0 + +[mgrs] +mon0 diff --git a/tests/functional/centos/7/crypt-ded-jrn/hosts b/tests/functional/centos/7/crypt-ded-jrn/hosts index 6404712ae..e1c1de6f8 100644 --- a/tests/functional/centos/7/crypt-ded-jrn/hosts +++ b/tests/functional/centos/7/crypt-ded-jrn/hosts @@ -5,4 +5,4 @@ mon0 osd0 [mgrs] -mgr0 +mon0 diff --git a/tests/functional/centos/7/crypt-ded-jrn/vagrant_variables.yml b/tests/functional/centos/7/crypt-ded-jrn/vagrant_variables.yml index 4ee3aaa27..8a8fb891d 100644 --- a/tests/functional/centos/7/crypt-ded-jrn/vagrant_variables.yml +++ b/tests/functional/centos/7/crypt-ded-jrn/vagrant_variables.yml @@ -12,7 +12,7 @@ nfs_vms: 0 rbd_mirror_vms: 0 client_vms: 0 iscsi_gw_vms: 0 -mgr_vms: 1 +mgr_vms: 0 # Deploy RESTAPI on each of the Monitors restapi: true diff --git a/tests/functional/centos/7/crypt-jrn-col/hosts b/tests/functional/centos/7/crypt-jrn-col/hosts index f6a265ab3..e1c1de6f8 100644 --- a/tests/functional/centos/7/crypt-jrn-col/hosts +++ b/tests/functional/centos/7/crypt-jrn-col/hosts @@ -3,3 +3,6 @@ mon0 [osds] osd0 + +[mgrs] +mon0 diff --git a/tests/functional/centos/7/docker-crypt-jrn-col/hosts b/tests/functional/centos/7/docker-crypt-jrn-col/hosts index f6a265ab3..e1c1de6f8 100644 --- a/tests/functional/centos/7/docker-crypt-jrn-col/hosts +++ b/tests/functional/centos/7/docker-crypt-jrn-col/hosts @@ -3,3 +3,6 @@ mon0 [osds] osd0 + +[mgrs] +mon0 diff --git a/tests/functional/centos/7/docker-ded-jrn/hosts b/tests/functional/centos/7/docker-ded-jrn/hosts index f6a265ab3..e1c1de6f8 100644 --- a/tests/functional/centos/7/docker-ded-jrn/hosts +++ b/tests/functional/centos/7/docker-ded-jrn/hosts @@ -3,3 +3,6 @@ mon0 [osds] osd0 + +[mgrs] +mon0 diff --git a/tests/functional/centos/7/jrn-col/hosts b/tests/functional/centos/7/jrn-col/hosts index f6a265ab3..e1c1de6f8 100644 --- a/tests/functional/centos/7/jrn-col/hosts +++ b/tests/functional/centos/7/jrn-col/hosts @@ -3,3 +3,6 @@ mon0 [osds] osd0 + +[mgrs] +mon0 diff --git a/tests/functional/centos/7/lvm-osds/hosts b/tests/functional/centos/7/lvm-osds/hosts index f6a265ab3..e1c1de6f8 100644 --- a/tests/functional/centos/7/lvm-osds/hosts +++ b/tests/functional/centos/7/lvm-osds/hosts @@ -3,3 +3,6 @@ mon0 [osds] osd0 + +[mgrs] +mon0 -- 2.39.5