From 6bbee088ea31be7ed82e3c5a8c22f2f9a5b29dce Mon Sep 17 00:00:00 2001
From: portdirect <pete@port.direct>
Date: Tue, 26 Dec 2017 17:52:27 -0500
Subject: [PATCH] Dev-Deploy: Deploy Nova with native kvm when possible
This PS adds support for Nova to run with native kvm when possible
using the developer deployment guide scripts.
Change-Id: I5d03dabfcb007f8a23ad65d3f129cb281b7aa87e
---
tools/deployment/developer/15-compute-kit.sh | 20 +++++++++++++++-----
1 file changed, 15 insertions(+), 5 deletions(-)
diff --git a/tools/deployment/developer/15-compute-kit.sh b/tools/deployment/developer/15-compute-kit.sh
index 6608976ebc..f025332fca 100755
--- a/tools/deployment/developer/15-compute-kit.sh
+++ b/tools/deployment/developer/15-compute-kit.sh
@@ -19,11 +19,21 @@ set -xe
make pull-images nova
make pull-images neutron
-#NOTE: Deploy command
-helm install ./nova \
- --namespace=openstack \
- --name=nova \
- --set conf.nova.libvirt.virt_type=qemu
+#NOTE: Deploy nova
+if [ "x$(systemd-detect-virt)" == "xnone" ]; then
+ echo 'OSH is not being deployed in virtualized environment'
+ helm install ./nova \
+ --namespace=openstack \
+ --name=nova
+else
+ echo 'OSH is being deployed in virtualized environment, using qemu for nova'
+ helm install ./nova \
+ --namespace=openstack \
+ --name=nova \
+ --set conf.nova.libvirt.virt_type=qemu
+fi
+
+#NOTE: Deploy neutron
helm install ./neutron \
--namespace=openstack \
--name=neutron \