From 7e02e3676f137d21f81d15f9a94f115a19363234 Mon Sep 17 00:00:00 2001
From: Pedro Alvarez <pedro.alvarez@codethink.co.uk>
Date: Mon, 16 Mar 2015 11:25:34 +0000
Subject: Add support in nova to configure virtualizaion type

---
 openstack-nova.configure                             | 3 +++
 openstack/usr/share/openstack/nova/nova-compute.conf | 2 +-
 openstack/usr/share/openstack/nova/nova.conf         | 2 +-
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/openstack-nova.configure b/openstack-nova.configure
index dc52381d..0c231198 100644
--- a/openstack-nova.configure
+++ b/openstack-nova.configure
@@ -51,6 +51,7 @@ if [ -z "$NOVA_SERVICE_USER" -a \
      -z "$NOVA_SERVICE_PASSWORD" -a \
      -z "$NOVA_DB_USER" -a \
      -z "$NOVA_DB_PASSWORD" -a \
+     -z "$NOVA_VIRT_TYPE" -a \
      -z "$NEUTRON_SERVICE_USER" -a \
      -z "$NEUTRON_SERVICE_PASSWORD" -a \
      -z "$METADATA_PROXY_SHARED_SECRET" -a \
@@ -69,6 +70,7 @@ if [ -z "$NOVA_SERVICE_USER" -o \
      -z "$NOVA_SERVICE_PASSWORD" -o \
      -z "$NOVA_DB_USER" -o \
      -z "$NOVA_DB_PASSWORD" -o \
+     -z "$NOVA_VIRT_TYPE" -o \
      -z "$NEUTRON_SERVICE_USER" -o \
      -z "$NEUTRON_SERVICE_PASSWORD" -o \
      -z "$METADATA_PROXY_SHARED_SECRET" -o \
@@ -98,6 +100,7 @@ nova_configuration={
     'NOVA_SERVICE_PASSWORD': os.environ['NOVA_SERVICE_PASSWORD'],
     'NOVA_DB_USER': os.environ['NOVA_DB_USER'],
     'NOVA_DB_PASSWORD': os.environ['NOVA_DB_PASSWORD'],
+    'NOVA_VIRT_TYPE': os.environ['NOVA_VIRT_TYPE'],
     'NEUTRON_SERVICE_USER': os.environ['NEUTRON_SERVICE_USER'],
     'NEUTRON_SERVICE_PASSWORD': os.environ['NEUTRON_SERVICE_PASSWORD'],
     'METADATA_PROXY_SHARED_SECRET': os.environ['METADATA_PROXY_SHARED_SECRET'],
diff --git a/openstack/usr/share/openstack/nova/nova-compute.conf b/openstack/usr/share/openstack/nova/nova-compute.conf
index 1ef5590c..b19de1d3 100644
--- a/openstack/usr/share/openstack/nova/nova-compute.conf
+++ b/openstack/usr/share/openstack/nova/nova-compute.conf
@@ -1,4 +1,4 @@
 [DEFAULT]
 compute_driver=libvirt.LibvirtDriver
 [libvirt]
-virt_type=qemu
+virt_type={{ NOVA_VIRT_TYPE }}
diff --git a/openstack/usr/share/openstack/nova/nova.conf b/openstack/usr/share/openstack/nova/nova.conf
index 610da0f9..a605e22d 100644
--- a/openstack/usr/share/openstack/nova/nova.conf
+++ b/openstack/usr/share/openstack/nova/nova.conf
@@ -633,4 +633,4 @@ allow_resize_to_same_host=True
 [libvirt]
 # Actual testing hardware does not support hardware acceleration
 # so in this step we will configure libvirt to use qemu instead of KVM
-virt_type=qemu
+virt_type={{ NOVA_VIRT_TYPE }}
-- 
cgit v1.2.1