ae1322ec10
This change updates the docker files to use base_package_type instead of doing specific distro checks for the rhel/deb generic cases. The base_distro is still available and is used when a specific distro needs a customization but if the differences are purely rpm vs deb, then the base_package_type can be used. Change-Id: I8d720bb185df65a0178061ccf20b1ab2265da2c5
47 lines
1.6 KiB
Django/Jinja
47 lines
1.6 KiB
Django/Jinja
FROM {{ namespace }}/{{ image_prefix }}ceilometer-base:{{ tag }}
|
|
LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
|
|
|
|
{% block ceilometer_compute_header %}{% endblock %}
|
|
|
|
{% import "macros.j2" as macros with context %}
|
|
|
|
{% if install_type == 'binary' %}
|
|
{% if base_package_type == 'rpm' %}
|
|
{% set ceilometer_compute_packages = [
|
|
'openstack-ceilometer-compute',
|
|
] %}
|
|
{% elif base_package_type == 'deb' %}
|
|
{% set ceilometer_compute_packages = [
|
|
'ceilometer-agent-compute',
|
|
'python-libvirt'
|
|
] %}
|
|
{% endif %}
|
|
{{ macros.install_packages(ceilometer_compute_packages | customizable("packages")) }}
|
|
|
|
{% elif install_type == 'source' %}
|
|
{% if base_package_type == 'rpm' %}
|
|
{% set ceilometer_compute_packages = [
|
|
'libvirt-python'
|
|
] %}
|
|
{% elif base_package_type == 'deb' %}
|
|
{% set ceilometer_compute_packages = [
|
|
'python-libvirt'
|
|
] %}
|
|
{% endif %}
|
|
|
|
{{ macros.install_packages(ceilometer_compute_packages | customizable("packages")) }}
|
|
|
|
# NOTE(jeffrey4l): just for back compatibility
|
|
{% set ceilometer_compute_pip_packages = [] %}
|
|
|
|
RUN {{ macros.install_pip(ceilometer_compute_pip_packages | customizable("pip_packages")) }}
|
|
|
|
{% endif %}
|
|
|
|
{% block ceilometer_compute_footer %}{% endblock %}
|
|
{% block footer %}{% endblock %}
|
|
|
|
# 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
|