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 <gabrioux@redhat.com>

diff --git a/tests/functional/centos/7/bluestore/hosts b/tests/functional/centos/7/bluestore/hosts
index 008f2cb56f8913756a2030003107e6924a33a15a..ea51342dd59a79e6b175fb3202c0567293c32213 100644 (file)
--- 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 576ef00344abf219eb9bfe1902fff86e296c3442..ded9c1540f2d33f9f11e28aa1e5491a5b67d0968 100644 (file)
--- 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 f6a265ab3e5d6093f9a7ed71fefc9358d8d0a8a3..e1c1de6f821a2c6348b7923232a2e12d3e768231 100644 (file)
--- 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 f6a265ab3e5d6093f9a7ed71fefc9358d8d0a8a3..e1c1de6f821a2c6348b7923232a2e12d3e768231 100644 (file)
--- 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 f6a265ab3e5d6093f9a7ed71fefc9358d8d0a8a3..e1c1de6f821a2c6348b7923232a2e12d3e768231 100644 (file)
--- 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 f6a265ab3e5d6093f9a7ed71fefc9358d8d0a8a3..e1c1de6f821a2c6348b7923232a2e12d3e768231 100644 (file)
--- 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 2d684367d038978c1dd0c6e2488b023eccf1ef6d..1a731a82c9bda8e3916b85f6d02cbab1dc3cdb73 100644 (file)
--- 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 5c4d1081f4357888e7c20cbe88adc7c14737241e..38faaa888d24fedc5aa8ef015d4c276a9a8ccc2e 100644 (file)
--- 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 89721c03ec6ef1358edf8d06b599e37dbe08c925..6085b1d2f28d548c4e884766f768236d249b5b49 100644 (file)
--- 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 6404712aef34ddb231fc75fde268108513898039..e1c1de6f821a2c6348b7923232a2e12d3e768231 100644 (file)
--- 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 4ee3aaa27cf048e5305cd6f89d18cd1dfaacf4ec..8a8fb891d5bb44d7d3ad9a0e08e72eb40393f8f8 100644 (file)
--- 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 f6a265ab3e5d6093f9a7ed71fefc9358d8d0a8a3..e1c1de6f821a2c6348b7923232a2e12d3e768231 100644 (file)
--- 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 f6a265ab3e5d6093f9a7ed71fefc9358d8d0a8a3..e1c1de6f821a2c6348b7923232a2e12d3e768231 100644 (file)
--- 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 f6a265ab3e5d6093f9a7ed71fefc9358d8d0a8a3..e1c1de6f821a2c6348b7923232a2e12d3e768231 100644 (file)
--- 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 f6a265ab3e5d6093f9a7ed71fefc9358d8d0a8a3..e1c1de6f821a2c6348b7923232a2e12d3e768231 100644 (file)
--- 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 f6a265ab3e5d6093f9a7ed71fefc9358d8d0a8a3..e1c1de6f821a2c6348b7923232a2e12d3e768231 100644 (file)
--- 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