8b3f0d0857
The rabbitmq-server package is upgraded to 3.5.7 in cloud-archive so we update centos to match The xen-utils package now needs an explict version, xen-utils-4.6 is what is provided by cloud-archive mitaka Libvirt 1.3 is in the ubuntu cloud-archive. This has a new daemon for logging that needs further implementation in newton. For now, it has been disabled within the qemu.conf Co-Authored-By: Jeffrey Zhang <jeffrey.zhang@99cloud.net> TrivialFix Change-Id: I84217824817c484b6800a64cbd7767b127a3098e
39 lines
1.1 KiB
Django/Jinja
39 lines
1.1 KiB
Django/Jinja
FROM {{ namespace }}/{{ image_prefix }}base:{{ tag }}
|
|
MAINTAINER {{ maintainer }}
|
|
|
|
{% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %}
|
|
|
|
RUN yum -y install \
|
|
libvirt-daemon \
|
|
libguestfs \
|
|
qemu-system-x86 \
|
|
libvirt-daemon-driver-nwfilter \
|
|
libvirt-daemon-config-nwfilter \
|
|
libvirt-daemon-driver-lxc \
|
|
ceph-common \
|
|
&& yum clean all
|
|
|
|
{% elif base_distro in ['ubuntu', 'debian'] %}
|
|
|
|
RUN apt-get install -y --no-install-recommends \
|
|
ceph-common \
|
|
libvirt-bin \
|
|
dmidecode \
|
|
pm-utils \
|
|
qemu \
|
|
qemu-block-extra \
|
|
ebtables \
|
|
xen-utils-4.6 \
|
|
&& apt-get clean \
|
|
&& mkdir -p /etc/ceph \
|
|
&& rm /etc/libvirt/qemu/networks/default.xml /etc/libvirt/qemu/networks/autostart/default.xml \
|
|
&& sed -i 's|.*stdio_handler.*|stdio_handler = "file"|' /etc/libvirt/qemu.conf
|
|
|
|
{% endif %}
|
|
|
|
COPY extend_start.sh /usr/local/bin/kolla_extend_start
|
|
RUN chmod 755 /usr/local/bin/kolla_extend_start \
|
|
&& useradd --user-group nova
|
|
|
|
{{ include_footer }}
|