diff --git a/virtual/cluster_destroy.sh b/virtual/cluster_destroy.sh index 9eeb9c3e5..cda6980b6 100755 --- a/virtual/cluster_destroy.sh +++ b/virtual/cluster_destroy.sh @@ -1,3 +1,4 @@ #!/bin/bash +set -ex vagrant destroy -f diff --git a/virtual/cluster_up.sh b/virtual/cluster_up.sh index fa03277fa..eefb09e90 100755 --- a/virtual/cluster_up.sh +++ b/virtual/cluster_up.sh @@ -1,5 +1,5 @@ #!/bin/bash -set -x +set -ex # start vagrant vagrant up --no-parallel --provider=libvirt diff --git a/virtual/install_dependencies.sh b/virtual/install_dependencies.sh index f30896864..3aa0ec65b 100755 --- a/virtual/install_dependencies.sh +++ b/virtual/install_dependencies.sh @@ -5,11 +5,22 @@ set -xe sudo apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 93C4A3FD7BB9C367 sudo apt update sudo apt install -y ansible -sudo apt install -y vagrant -sudo pip install netaddr + +if [ "$(lsb_release -cs)" = "bionic" ]; then + # dotless-de/vagrant-vbguest#292 + pushd "$(mktemp -d)" + wget https://releases.hashicorp.com/vagrant/2.0.3/vagrant_2.0.3_x86_64.deb -O vagrant.deb + sudo dpkg -i vagrant.deb + popd +else + sudo apt install -y vagrant +fi + +sudo apt install -y python-netaddr +sudo apt install -y sshpass # install kvm packages -sudo apt install -y qemu-kvm libvirt-bin bridge-utils libguestfs-tools +sudo apt install -y qemu-kvm libvirt-bin libvirt-dev bridge-utils libguestfs-tools sudo apt install -y qemu ovmf virt-manager firewalld # install vagrant plugins