0c9d5c4c26
Small change to remove the default network since neutron handles all of the bridge and veth creation. virbr0 becomes clutter. CentOS doesn't seem to come with this default.xml network, so no change there. Note: This doesn't remove virbr0 from a running system, it only prevents its creation. Change-Id: I8e118ea285c674a47884bbe864df134133406bbc Closes-Bug: #1512060 Potential-Backport: Liberty
36 lines
963 B
Django/Jinja
36 lines
963 B
Django/Jinja
FROM {{ namespace }}/{{ image_prefix }}base:{{ tag }}
|
|
MAINTAINER Kolla Project (https://launchpad.net/kolla)
|
|
|
|
{% 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 \
|
|
&& apt-get clean \
|
|
&& mkdir -p /etc/ceph \
|
|
&& rm /etc/libvirt/qemu/networks/default.xml /etc/libvirt/qemu/networks/autostart/default.xml
|
|
|
|
{% endif %}
|
|
|
|
COPY extend_start.sh /usr/local/bin/kolla_extend_start
|
|
RUN chmod 755 /usr/local/bin/kolla_extend_start
|
|
|
|
{{ include_footer }}
|