From: wrider <lji@research.att.com>
Date: Fri, 26 Jul 2019 04:23:53 +0000 (-0400)
Subject: Added code to not install low latency kernel to Virtualbox VM
X-Git-Tag: 0.0.2~48^2
X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=commitdiff_plain;h=9c0949b7a32685b1d59e0aa5b2001ef9a2acc7ad;p=it%2Fdep.git

Added code to not install low latency kernel to Virtualbox VM

Low latency kernel causing VirtualBox Ubuntu VMs to hang.  This
fix avoids installing the low latency kernel if the VM is identified
as a VirtualBox VM.

Change-Id: Iccf688ff0c0448ee60c0ae58d5565b8881bcc338
Signed-off-by: wrider <lji@research.att.com>
---

diff --git a/ric-infra/00-Kubernetes/heat/scripts/k8s_vm_install.sh b/ric-infra/00-Kubernetes/heat/scripts/k8s_vm_install.sh
index e1e96150..25550a1b 100644
--- a/ric-infra/00-Kubernetes/heat/scripts/k8s_vm_install.sh
+++ b/ric-infra/00-Kubernetes/heat/scripts/k8s_vm_install.sh
@@ -127,7 +127,13 @@ echo 'deb http://apt.kubernetes.io/ kubernetes-xenial main' > /etc/apt/sources.l
 
 # install low latency kernel, docker.io, and kubernetes
 apt-get update
-apt-get install -y linux-image-4.15.0-45-lowlatency curl jq netcat docker.io=${DOCKERVERSION}
+apt-get install -y virt-what
+if ! echo $(virt-what) | grep "virtualbox"; then
+  # this version of low latency kernel causes virtualbox VM to hand.  
+  # install if identifying the VM not being a virtualbox VM.
+  apt-get install -y linux-image-4.15.0-45-lowlatency
+fi
+apt-get install -y curl jq netcat docker.io=${DOCKERVERSION}
 apt-get install -y kubernetes-cni=${CNIVERSION}
 apt-get install -y --allow-unauthenticated kubeadm=${KUBEVERSION} kubelet=${KUBEVERSION} kubectl=${KUBEVERSION}
 apt-mark hold docker.io kubernetes-cni kubelet kubeadm kubectl