diff options
| author | xionglingfeng <xionglingfeng@Gmail.com> | 2016-02-21 23:35:47 -0400 |
|---|---|---|
| committer | Lingfeng Xiong <xionglingfeng@Gmail.com> | 2016-02-22 23:27:00 +0000 |
| commit | 35660e0e100b0f4f871d74a3e5b05afe6da104ab (patch) | |
| tree | 1b5bbdf1dfb8aa4777505875a506e019023d28fe | |
| parent | 2b0a070ee5463bc12bd6c1ea3799f634571f00b7 (diff) | |
| download | kolla-35660e0e100b0f4f871d74a3e5b05afe6da104ab.tar.gz kolla-35660e0e100b0f4f871d74a3e5b05afe6da104ab.zip | |
Multiple hypervisor driver support for nova
Change-Id: I84a7c817dec17175eb1a5cda64ba9e5056c57e50
Implements: blueprint nova-multiple-drivers
| -rw-r--r-- | docker/nova/nova-compute/Dockerfile.j2 | 3 | ||||
| -rw-r--r-- | docker/nova/nova-libvirt/Dockerfile.j2 | 1 | ||||
| -rw-r--r-- | docker/nova/nova-libvirt/extend_start.sh | 5 |
3 files changed, 8 insertions, 1 deletions
diff --git a/docker/nova/nova-compute/Dockerfile.j2 b/docker/nova/nova-compute/Dockerfile.j2 index 200e2c100..9b2bd3792 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 19f6053ce..fc54c3ed8 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 3b8084ca8..2b6f481a0 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 |