tests: add 2 more mons to xenial_cluster

Signed-off-by: Andrew Schoen <aschoen@redhat.com>

diff --git a/tests/functional/ubuntu/16.04/mon-osd-mds-rgw/hosts b/tests/functional/ubuntu/16.04/mon-osd-mds-rgw/hosts
index 356860f9b02ff0721834f233ef69c10167574dbd..b87a697373636489a09a4cbfa487fbfbaafc3862 100644 (file)
--- a/tests/functional/ubuntu/16.04/mon-osd-mds-rgw/hosts
+++ b/tests/functional/ubuntu/16.04/mon-osd-mds-rgw/hosts
@@ -1,5 +1,7 @@
 [mons]
-mon0 monitor_interface=eth1
+mon0 monitor_address=192.168.5.10
+mon1 monitor_address=192.168.5.11
+mon2 monitor_interface=eth1
 
 [osds]
 osd0

diff --git a/tests/functional/ubuntu/16.04/mon-osd-mds-rgw/scenario.py b/tests/functional/ubuntu/16.04/mon-osd-mds-rgw/scenario.py
index 4597b589fc29ab669f8f1f388bb105f2d45ce413..61e80611ad0c5697bf67bba219578a861d096022 100644 (file)
--- a/tests/functional/ubuntu/16.04/mon-osd-mds-rgw/scenario.py
+++ b/tests/functional/ubuntu/16.04/mon-osd-mds-rgw/scenario.py
@@ -1,7 +1,8 @@
 # Basic information about ceph and its configuration
 ceph = {
     'releases': ['infernalis', 'jewel'],
-    'cluster_name': 'ceph'
+    'cluster_name': 'ceph',
+    'subnet': '192.168.5',
 }
 
 # remote nodes to test, with anything specific to them that might be useful for
@@ -10,7 +11,15 @@ ceph = {
 nodes = {
     'mon0': {
         'username': 'vagrant',
-        'components': ['mon', 'mon_initial_members']
+        'components': ['conf_tests']
+    },
+    'mon1': {
+        'username': 'vagrant',
+        'components': ['conf_tests']
+    },
+    'mon2': {
+        'username': 'vagrant',
+        'components': ['conf_tests']
     },
     'osd0': {
         'username': 'vagrant',

diff --git a/tests/functional/ubuntu/16.04/mon-osd-mds-rgw/vagrant_variables.yml b/tests/functional/ubuntu/16.04/mon-osd-mds-rgw/vagrant_variables.yml
index 15e4c038f9502637147c8db3953104b5e8895015..f894771c0003cee982d37c8f07a38ecea51f2288 100644 (file)
--- a/tests/functional/ubuntu/16.04/mon-osd-mds-rgw/vagrant_variables.yml
+++ b/tests/functional/ubuntu/16.04/mon-osd-mds-rgw/vagrant_variables.yml
@@ -4,7 +4,7 @@
 docker: false
 
 # DEFINE THE NUMBER OF VMS TO RUN
-mon_vms: 1
+mon_vms: 3
 osd_vms: 1
 mds_vms: 1
 rgw_vms: 1