From 35660e0e100b0f4f871d74a3e5b05afe6da104ab Mon Sep 17 00:00:00 2001
From: xionglingfeng <xionglingfeng@Gmail.com>
Date: Sun, 21 Feb 2016 23:35:47 -0400
Subject: [PATCH] Multiple hypervisor driver support for nova

Change-Id: I84a7c817dec17175eb1a5cda64ba9e5056c57e50
Implements: blueprint nova-multiple-drivers
---
 docker/nova/nova-compute/Dockerfile.j2   | 3 ++-
 docker/nova/nova-libvirt/Dockerfile.j2   | 1 +
 docker/nova/nova-libvirt/extend_start.sh | 5 +++++
 3 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/docker/nova/nova-compute/Dockerfile.j2 b/docker/nova/nova-compute/Dockerfile.j2
index 200e2c100d..9b2bd3792f 100644
--- a/docker/nova/nova-compute/Dockerfile.j2
+++ b/docker/nova/nova-compute/Dockerfile.j2
@@ -21,7 +21,8 @@ RUN apt-get install -y --no-install-recommends \
         ceph-common \
         ironic-common \
         python-ironicclient \
-    && apt-get clean
+    && apt-get clean \
+    && rm -f /etc/nova/nova-compute.conf
 
     {% endif %}
 {% elif install_type == 'source' %}
diff --git a/docker/nova/nova-libvirt/Dockerfile.j2 b/docker/nova/nova-libvirt/Dockerfile.j2
index 19f6053ce1..fc54c3ed84 100644
--- a/docker/nova/nova-libvirt/Dockerfile.j2
+++ b/docker/nova/nova-libvirt/Dockerfile.j2
@@ -23,6 +23,7 @@ RUN apt-get install -y --no-install-recommends \
         qemu \
         qemu-block-extra \
         ebtables \
+        xen-utils \
     && apt-get clean \
     && mkdir -p /etc/ceph \
     && rm /etc/libvirt/qemu/networks/default.xml /etc/libvirt/qemu/networks/autostart/default.xml
diff --git a/docker/nova/nova-libvirt/extend_start.sh b/docker/nova/nova-libvirt/extend_start.sh
index 3b8084ca8c..2b6f481a0b 100644
--- a/docker/nova/nova-libvirt/extend_start.sh
+++ b/docker/nova/nova-libvirt/extend_start.sh
@@ -8,6 +8,11 @@ if [[ -c /dev/kvm ]]; then
     chown root:kvm /dev/kvm
 fi
 
+# Mount xenfs for libxl to work
+if [[ $(lsmod | grep xenfs) ]]; then
+    mount -t xenfs xenfs /proc/xen
+fi
+
 if [[ ! -d "/var/log/kolla/nova" ]]; then
     mkdir -p /var/log/kolla/nova
 fi