From ecf68fa449355e28c1d87d3e1d68f40e1603e980 Mon Sep 17 00:00:00 2001 From: Motonori Shindo Date: Fri, 9 Jan 2015 18:31:51 +0900 Subject: vagrant: make sure to bootstrap before configure_ovs. The order of execution in Vagrantfile is "outside-in" meaning that all commands in outer scope are executed first and then the commands in inner scope. Because of this ordering, "configure_ovs" is executed before "bootstrap_fedora", resulting in "configure_ovs" to fail as it is not bootsrapped yet. This change fixes this problem by removing the nested scope in Vagrant.configure block. Multi-machine is not used so we don't need config.vm.define block. Signed-off-by: Motonori Shindo Signed-off-by: Thomas Graf --- Vagrantfile | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'Vagrantfile') diff --git a/Vagrantfile b/Vagrantfile index 982eb0113..82b157cd5 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -10,6 +10,8 @@ yum -y install autoconf automake openssl-devel libtool \ python-twisted-core python-zope-interface PyQt4 \ desktop-file-utils groff graphviz rpmdevtools echo "search extra update built-in" >/etc/depmod.d/search_path.conf +cd /vagrant +./boot.sh SCRIPT $configure_ovs = <