openstack/kolla-ansible
Code Issues Proposed changes

Multiple hypervisor driver support for nova

Browse Source 
Change-Id: I84a7c817dec17175eb1a5cda64ba9e5056c57e50
Implements: blueprint nova-multiple-drivers
This commit is contained in:
xionglingfeng 2016-02-21 23:35:47 -04:00 committed by Lingfeng Xiong
parent 2b0a070ee5
commit 35660e0e10
3 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
docker/nova/nova-compute/Dockerfile.j2
View File

@ -21,7 +21,8 @@ RUN apt-get install -y --no-install-recommends \
ceph-common \ ceph-common \
ironic-common \ ironic-common \
python-ironicclient \ python-ironicclient \
&& apt-get clean && apt-get clean \
&& rm -f /etc/nova/nova-compute.conf
{% endif %} {% endif %}
{% elif install_type == 'source' %} {% elif install_type == 'source' %}

1
docker/nova/nova-libvirt/Dockerfile.j2
View File

@ -23,6 +23,7 @@ RUN apt-get install -y --no-install-recommends \
qemu \ qemu \
qemu-block-extra \ qemu-block-extra \
ebtables \ ebtables \
xen-utils \
&& apt-get clean \ && apt-get clean \
&& mkdir -p /etc/ceph \ && mkdir -p /etc/ceph \
&& rm /etc/libvirt/qemu/networks/default.xml /etc/libvirt/qemu/networks/autostart/default.xml && rm /etc/libvirt/qemu/networks/default.xml /etc/libvirt/qemu/networks/autostart/default.xml

5
docker/nova/nova-libvirt/extend_start.sh
View File

@ -8,6 +8,11 @@ if [[ -c /dev/kvm ]]; then
chown root:kvm /dev/kvm chown root:kvm /dev/kvm
fi 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 if [[ ! -d "/var/log/kolla/nova" ]]; then
mkdir -p /var/log/kolla/nova mkdir -p /var/log/kolla/nova
fi fi