diff options
| -rwxr-xr-x | vagrant/node.sh | 5 | ||||
| -rw-r--r-- | vagrant/playbooks/configure-virtlet.yml | 4 |
2 files changed, 8 insertions, 1 deletions
diff --git a/vagrant/node.sh b/vagrant/node.sh index 3bf704b1..a51be19b 100755 --- a/vagrant/node.sh +++ b/vagrant/node.sh @@ -10,7 +10,6 @@ set -o nounset set -o pipefail -set -o xtrace # usage() - Prints the usage of the program function usage { @@ -62,6 +61,7 @@ if [[ $vendor_id == *GenuineIntel* ]]; then rmmod kvm-intel echo 'options kvm-intel nested=y' >> /etc/modprobe.d/dist.conf modprobe kvm-intel + echo kvm-intel >> /etc/modules fi else kvm_ok=$(cat /sys/module/kvm_amd/parameters/nested) @@ -70,8 +70,11 @@ else rmmod kvm-amd sh -c "echo 'options kvm-amd nested=1' >> /etc/modprobe.d/dist.conf" modprobe kvm-amd + echo kvm-amd >> /etc/modules fi fi +modprobe vhost_net +echo vhost_net >> /etc/modules source /etc/os-release || source /usr/lib/os-release case ${ID,,} in *suse) diff --git a/vagrant/playbooks/configure-virtlet.yml b/vagrant/playbooks/configure-virtlet.yml index fcc33716..98aa74cc 100644 --- a/vagrant/playbooks/configure-virtlet.yml +++ b/vagrant/playbooks/configure-virtlet.yml @@ -32,8 +32,12 @@ create: yes block: | translations: + - name: ubuntu/14.04 + url: https://cloud-images.ubuntu.com/trusty/current/trusty-server-cloudimg-amd64-disk1.img - name: ubuntu/16.04 url: https://cloud-images.ubuntu.com/xenial/current/xenial-server-cloudimg-amd64-disk1.img + - name: ubuntu/18.04 + url: https://cloud-images.ubuntu.com/bionic/current/bionic-server-cloudimg-amd64.img - regexp: 'centos/(\d+)-(\d+)' url: 'https://cloud.centos.org/centos/$1/images/CentOS-$1-x86_64-GenericCloud-$2.qcow2' - name: fedora |