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

diff --git a/tests/functional/centos/7/mon-osd/group_vars/all b/tests/functional/centos/7/mon-osd/group_vars/all
index 4e410c37c09a781a71f0a1b558242cc797751f96..829d6b24f522d0601dfbcd5a24ee2a6917f45bb7 100644 (file)
--- 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 6198692df7cf2dbf53155cd531c2379b754a633c..89721c03ec6ef1358edf8d06b599e37dbe08c925 100644 (file)
--- 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 2178e07b587a18262c3f48c936b80e1dae16f76f..761fe3dffc843f537b59734181079b7feef02ec8 100644 (file)
--- 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