CORD-1876 Use standard upstream vagrant-libvirt plugin
Change-Id: I56865b1e337e988130058222aab766e367fb66e2
(cherry picked from commit 1e6cf6e6310cc50b953affd1acecf61d081fbb52)
diff --git a/scripts/cord-bootstrap.sh b/scripts/cord-bootstrap.sh
index 675c7f5..ebcff0e 100755
--- a/scripts/cord-bootstrap.sh
+++ b/scripts/cord-bootstrap.sh
@@ -106,22 +106,13 @@
curl -o /tmp/vagrant.deb https://releases.hashicorp.com/vagrant/1.9.3/vagrant_1.9.3_x86_64.deb
echo "$VAGRANT_SHA256SUM /tmp/vagrant.deb" | sha256sum -c -
sudo dpkg -i /tmp/vagrant.deb
- sudo apt-get -y install qemu-kvm libvirt-bin libvirt-dev nfs-kernel-server ruby2.0
+ sudo apt-get -y install qemu-kvm libvirt-bin libvirt-dev nfs-kernel-server
sudo adduser $USER libvirtd
run_stage cloudlab_setup
echo "Installing vagrant plugins..."
- # FIXME: fix for vagrant-libvirt dependency issue that arose on 2017-04-28 - zdw
- # vagrant plugin list | grep vagrant-libvirt || vagrant plugin install vagrant-libvirt --plugin-version 0.0.35
- if ! vagrant plugin list | grep vagrant-libvirt
- then
- git clone -b remove_xmlrpc_dep https://github.com/zdw/vagrant-libvirt.git ${HOME}/vagrant-libvirt
- cd ~/vagrant-libvirt
- gem2.0 build vagrant-libvirt.gemspec
- vagrant plugin install vagrant-libvirt-0.0.35.gem
- cd ~
- fi
+ vagrant plugin list | grep vagrant-libvirt || vagrant plugin install vagrant-libvirt --plugin-version 0.0.35
vagrant plugin list | grep vagrant-mutate || vagrant plugin install vagrant-mutate
vagrant plugin list | grep vagrant-hosts || vagrant plugin install vagrant-hosts