a9d08726f5
Currently if the install_packages macro is run with an empty package list, it will add a yum or apt-get command with no packages listed. This bug fix aims to omit this line when no packages have been given, or, the operator wants to use the "_override" / "_remove" functionality to disable all packages being installed in a Dockerfile. Co-Authored-By: Paul Bourke <paul.bourke@oracle.com> Change-Id: Ifaaaebfccc3adb0f2f68a35ac08e59378bc87fdb Closes-bug: 1612446
47 lines
1.4 KiB
Django/Jinja
47 lines
1.4 KiB
Django/Jinja
FROM {{ namespace }}/{{ image_prefix }}ceilometer-base:{{ tag }}
|
|
MAINTAINER {{ maintainer }}
|
|
|
|
{% import "macros.j2" as macros with context %}
|
|
|
|
{% if install_type == 'binary' %}
|
|
{% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %}
|
|
{% set ceilometer_compute_packages = [
|
|
'openstack-ceilometer-compute',
|
|
'python-ceilometerclient'
|
|
] %}
|
|
{% elif base_distro in ['ubuntu', 'debian'] %}
|
|
{% set ceilometer_compute_packages = [
|
|
'ceilometer-agent-compute',
|
|
'python-ceilometerclient'
|
|
] %}
|
|
{% endif %}
|
|
|
|
{{ macros.install_packages(ceilometer_compute_packages | customizable("packages")) }}
|
|
|
|
{% elif install_type == 'source' %}
|
|
{% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %}
|
|
|
|
RUN yum -y install \
|
|
libvirt-devel \
|
|
&& yum clean all
|
|
|
|
{% elif base_distro in ['ubuntu', 'debian'] %}
|
|
|
|
RUN apt-get -y install --no-install-recommends \
|
|
libvirt-dev \
|
|
&& apt-get clean
|
|
|
|
{% endif %}
|
|
|
|
RUN /var/lib/kolla/venv/bin/pip --no-cache-dir install --upgrade -c requirements/upper-constraints.txt libvirt-python
|
|
|
|
{% endif %}
|
|
|
|
{% block ceilometer_compute_footer %}{% endblock %}
|
|
{% block footer %}{% endblock %}
|
|
{{ include_footer }}
|
|
|
|
# NOTE(huikang): non-root user does not work with libvirt.sock.
|
|
# Need configuration in nova-libvirt container to allow
|
|
# USER ceilometer to access libvirt.sock
|