From 1574e8f4ab3e2cb28205b3877cb6360c8b0a358c Mon Sep 17 00:00:00 2001 From: Andrew Schoen Date: Thu, 1 Dec 2016 17:27:09 -0600 Subject: [PATCH] tests: make centos7_cluster use three mons Signed-off-by: Andrew Schoen --- tests/functional/centos/7/cluster/hosts | 4 +++- tests/functional/centos/7/cluster/scenario.py | 13 +++++++++++-- .../centos/7/cluster/vagrant_variables.yml | 2 +- 3 files changed, 15 insertions(+), 4 deletions(-) diff --git a/tests/functional/centos/7/cluster/hosts b/tests/functional/centos/7/cluster/hosts index 356860f9b..b732c4154 100644 --- a/tests/functional/centos/7/cluster/hosts +++ b/tests/functional/centos/7/cluster/hosts @@ -1,5 +1,7 @@ [mons] -mon0 monitor_interface=eth1 +mon0 monitor_address=192.168.1.10 +mon1 monitor_interface=eth1 +mon2 monitor_address=192.168.1.12 [osds] osd0 diff --git a/tests/functional/centos/7/cluster/scenario.py b/tests/functional/centos/7/cluster/scenario.py index 4597b589f..658444f03 100644 --- a/tests/functional/centos/7/cluster/scenario.py +++ b/tests/functional/centos/7/cluster/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.1', } # 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/centos/7/cluster/vagrant_variables.yml b/tests/functional/centos/7/cluster/vagrant_variables.yml index ac76f1d89..7eb80e799 100644 --- a/tests/functional/centos/7/cluster/vagrant_variables.yml +++ b/tests/functional/centos/7/cluster/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