diff options
| author |   Victor Morales <victor.morales@intel.com> | 2018-10-16 15:21:48 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2018-10-16 15:21:48 +0000 |
| commit | a4b27ed2f69b6643e5f9b6004e632f06db4d0653 (patch) | |
| tree | 658b1629bdef67449ca6bed780ff92e3375c5bf3 | |
| parent | 2312732ead8b50849edfd7fc73754a1c5f230ba1 (diff) | |
| parent | 1e2311043ead1e07b3f22d4704959faa08edfb87 (diff) | |
Merge "Improve setup.sh script"
| -rwxr-xr-x | vagrant/setup.sh | 24 |
1 files changed, 23 insertions, 1 deletions
diff --git a/vagrant/setup.sh b/vagrant/setup.sh index 85900fda..2dfae83b 100755 --- a/vagrant/setup.sh +++ b/vagrant/setup.sh @@ -114,7 +114,7 @@ case ${ID,,} in ;; libvirt) # vagrant-libvirt dependencies - packages+=(qemu libvirt-bin ebtables dnsmasq libxslt-dev libxml2-dev libvirt-dev zlib1g-dev ruby-dev) + packages+=(qemu libvirt-bin ebtables dnsmasq libxslt-dev libxml2-dev libvirt-dev zlib1g-dev ruby-dev cpu-checker) # NFS packages+=(nfs-kernel-server) ;; @@ -153,6 +153,27 @@ case ${ID,,} in esac +# Enable Nested-Virtualization +vendor_id=$(lscpu|grep "Vendor ID") +if [[ $vendor_id == *GenuineIntel* ]]; then + kvm_ok=$(cat /sys/module/kvm_intel/parameters/nested) + if [[ $kvm_ok == 'N' ]]; then + echo "Enable Intel Nested-Virtualization" + rmmod kvm-intel + echo 'options kvm-intel nested=y' >> /etc/modprobe.d/dist.conf + modprobe kvm-intel + fi +else + kvm_ok=$(cat /sys/module/kvm_amd/parameters/nested) + if [[ $kvm_ok == '0' ]]; then + echo "Enable AMD Nested-Virtualization" + rmmod kvm-amd + sh -c "echo 'options kvm-amd nested=1' >> /etc/modprobe.d/dist.conf" + modprobe kvm-amd + fi +fi +modprobe vhost_net + ${INSTALLER_CMD} ${packages[@]} if ! which pip; then curl -sL https://bootstrap.pypa.io/get-pip.py | sudo python @@ -166,4 +187,5 @@ if [ $VAGRANT_DEFAULT_PROVIDER == libvirt ]; then vagrant plugin install vagrant-libvirt sudo usermod -a -G $libvirt_group $USER # This might require to reload user's group assigments sudo systemctl restart libvirtd + kvm-ok fi |