diff options
| author | Mark D. Gray <mark.d.gray@intel.com> | 2015-11-24 19:39:38 +0000 |
|---|---|---|
| committer | Ben Pfaff <blp@ovn.org> | 2015-11-29 18:27:31 -0800 |
| commit | d64c5e860813faae8b789e95c950d3e65d5f73b9 (patch) | |
| tree | c6b70e17d0a3b2239b7b98ccbf78c874ffdb7033 /Vagrantfile | |
| parent | bab86012066c353c75d2b8446c25daea2471d939 (diff) | |
| download | openvswitch-d64c5e860813faae8b789e95c950d3e65d5f73b9.tar.gz | |
Vagrantfile: Update to Fedora 22 base box
Fedora 20 base box is no longer available at chef/fedora20.
Signed-off-by: Mark D. Gray <mark.d.gray@intel.com>
Signed-off-by: Ben Pfaff <blp@ovn.org>
Diffstat (limited to 'Vagrantfile')
| -rw-r--r-- | Vagrantfile | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/Vagrantfile b/Vagrantfile index e8c104de7..102a17dee 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -6,11 +6,11 @@ VAGRANTFILE_API_VERSION = "2" Vagrant.require_version ">=1.7.0" $bootstrap_fedora = <<SCRIPT -yum -y update -yum -y install autoconf automake openssl-devel libtool \ +dnf -y update +dnf -y install autoconf automake openssl-devel libtool \ python-twisted-core python-zope-interface PyQt4 \ desktop-file-utils groff graphviz rpmdevtools \ - kernel-devel-`uname -r` + libcap-ng-devel kernel-devel-`uname -r` echo "search extra update built-in" >/etc/depmod.d/search_path.conf cd /vagrant ./boot.sh @@ -41,7 +41,7 @@ cp openvswitch-$PACKAGE_VERSION.tar.gz $HOME/rpmbuild/SOURCES rpmbuild --bb -D "kversion `uname -r`" /vagrant/rhel/openvswitch-kmod-fedora.spec rpmbuild --bb --without check /vagrant/rhel/openvswitch-fedora.spec rpm -e openvswitch -rpm -ivh $HOME/rpmbuild/RPMS/x86_64/openvswitch-$PACKAGE_VERSION-1.fc20.x86_64.rpm +rpm -ivh $HOME/rpmbuild/RPMS/x86_64/openvswitch-$PACKAGE_VERSION-1.fc22.x86_64.rpm systemctl enable openvswitch systemctl start openvswitch systemctl status openvswitch @@ -53,8 +53,8 @@ make check-system-userspace SCRIPT Vagrant.configure(VAGRANTFILE_API_VERSION) do |config| - config.vm.define "fedora-20" do |fedora| - fedora.vm.box = "chef/fedora-20" + config.vm.define "fedora-22" do |fedora| + fedora.vm.box = "bento/fedora-22" fedora.vm.provision "bootstrap", type: "shell", inline: $bootstrap_fedora fedora.vm.provision "configure_ovs", type: "shell", inline: $configure_ovs fedora.vm.provision "build_ovs", type: "shell", inline: $build_ovs |