From 0522d32e7e16a9d9de7ae84d1376e7336d63a98e Mon Sep 17 00:00:00 2001 From: Andrew Schoen Date: Tue, 8 Nov 2016 15:53:58 -0600 Subject: [PATCH] tests: change the centos box to centos/7 This box supports both libvirt and virtualbox. Eventually we want to be building our own boxes but this should work in the short term. Signed-off-by: Andrew Schoen --- tests/functional/centos/7/mon-osd/group_vars/all | 2 +- tests/functional/centos/7/mon-osd/hosts | 3 +-- tests/functional/centos/7/mon-osd/vagrant_variables.yml | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/tests/functional/centos/7/mon-osd/group_vars/all b/tests/functional/centos/7/mon-osd/group_vars/all index 4e410c37c..829d6b24f 100644 --- a/tests/functional/centos/7/mon-osd/group_vars/all +++ b/tests/functional/centos/7/mon-osd/group_vars/all @@ -5,8 +5,8 @@ public_network: "192.168.42.0/24" cluster_network: "192.168.43.0/24" journal_size: 100 devices: + - '/dev/sda' - '/dev/sdb' - - '/dev/sdc' journal_collocation: True os_tuning_params: - { name: kernel.pid_max, value: 4194303 } diff --git a/tests/functional/centos/7/mon-osd/hosts b/tests/functional/centos/7/mon-osd/hosts index 6198692df..89721c03e 100644 --- a/tests/functional/centos/7/mon-osd/hosts +++ b/tests/functional/centos/7/mon-osd/hosts @@ -1,6 +1,5 @@ [mons] -# centos7 uses the enp0s8 interface -mon0 monitor_interface=enp0s8 +mon0 monitor_interface=eth1 [osds] osd0 diff --git a/tests/functional/centos/7/mon-osd/vagrant_variables.yml b/tests/functional/centos/7/mon-osd/vagrant_variables.yml index 2178e07b5..761fe3dff 100644 --- a/tests/functional/centos/7/mon-osd/vagrant_variables.yml +++ b/tests/functional/centos/7/mon-osd/vagrant_variables.yml @@ -46,7 +46,7 @@ disks: "[ '/dev/sdb', '/dev/sdc' ]" # For more boxes have a look at: # - https://atlas.hashicorp.com/boxes/search?utf8=✓&sort=&provider=virtualbox&q= # - https://download.gluster.org/pub/gluster/purpleidea/vagrant/ -vagrant_box: box-cutter/centos72 +vagrant_box: centos/7 #ssh_private_key_path: "~/.ssh/id_rsa" # The sync directory changes based on vagrant box # Set to /home/vagrant/sync for Centos/7, /home/{ user }/vagrant for openstack and defaults to /vagrant