diff options
| author | Motonori Shindo <motonori@shin.do> | 2015-01-09 18:31:51 +0900 |
|---|---|---|
| committer | Thomas Graf <tgraf@noironetworks.com> | 2015-01-09 12:08:59 +0100 |
| commit | ecf68fa449355e28c1d87d3e1d68f40e1603e980 (patch) | |
| tree | 06f4e9434f6ceeb5dbcb5dee3edf6534aa5c24d8 /Vagrantfile | |
| parent | b56b2566417dd436e768394c12b030019d2dc101 (diff) | |
| download | openvswitch-ecf68fa449355e28c1d87d3e1d68f40e1603e980.tar.gz | |
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 <motonori@shin.do>
Signed-off-by: Thomas Graf <tgraf@noironetworks.com>
Diffstat (limited to 'Vagrantfile')
| -rw-r--r-- | Vagrantfile | 9 |
1 files changed, 4 insertions, 5 deletions
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 = <<SCRIPT @@ -38,11 +40,8 @@ sudo systemctl status openvswitch SCRIPT Vagrant.configure(VAGRANTFILE_API_VERSION) do |config| - config.vm.define "fedora-20" do |fedora| - fedora.vm.box = "chef/fedora-20" - fedora.vm.provision :shell, inline: $bootstrap_fedora - end - + config.vm.box = "chef/fedora-20" + config.vm.provision "bootstrap", type: "shell", inline: $bootstrap_fedora config.vm.provision "configure_ovs", type: "shell", inline: $configure_ovs, privileged: false config.vm.provision "build_ovs", type: "shell", inline: $build_ovs, privileged: false config.vm.provision "install_rpm", type: "shell", inline: $install_rpm, privileged: false |