aboutsummaryrefslogtreecommitdiff
path: root/kolla/docker/ceilometer
diff options
context:
space:
mode:
Diffstat (limited to 'kolla/docker/ceilometer')
-rw-r--r--kolla/docker/ceilometer/ceilometer-base/Dockerfile.j23
-rw-r--r--kolla/docker/ceilometer/ceilometer-compute/Dockerfile.j23
-rw-r--r--kolla/docker/ceilometer/ceilometer-ipmi/Dockerfile.j23
3 files changed, 9 insertions, 0 deletions
diff --git a/kolla/docker/ceilometer/ceilometer-base/Dockerfile.j2 b/kolla/docker/ceilometer/ceilometer-base/Dockerfile.j2
index 18bd7600a..4e3a63d02 100644
--- a/kolla/docker/ceilometer/ceilometer-base/Dockerfile.j2
+++ b/kolla/docker/ceilometer/ceilometer-base/Dockerfile.j2
@@ -7,6 +7,8 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}"
{% import "macros.j2" as macros with context %}
+{{ macros.kolla_enable_base_repos() }}
+
{{ macros.configure_user(name='ceilometer') }}
{% set ceilometer_base_pip_packages = [
@@ -41,3 +43,4 @@ RUN ln -s ceilometer-base-source/* ceilometer \
{{ macros.kolla_patch_sources() }}
{% block ceilometer_base_footer %}{% endblock %}
+{{ macros.kolla_cleanup_repos() }}
diff --git a/kolla/docker/ceilometer/ceilometer-compute/Dockerfile.j2 b/kolla/docker/ceilometer/ceilometer-compute/Dockerfile.j2
index 879c4fb01..629aa5283 100644
--- a/kolla/docker/ceilometer/ceilometer-compute/Dockerfile.j2
+++ b/kolla/docker/ceilometer/ceilometer-compute/Dockerfile.j2
@@ -7,6 +7,8 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}"
{% import "macros.j2" as macros with context %}
+{{ macros.kolla_enable_base_repos() }}
+
{% if base_package_type == 'rpm' %}
{% set ceilometer_compute_packages = [
'python3-libvirt'
@@ -28,6 +30,7 @@ RUN {{ macros.install_pip(ceilometer_compute_pip_packages | customizable("pip_pa
{% block ceilometer_compute_footer %}{% endblock %}
{% block footer %}{% endblock %}
+{{ macros.kolla_cleanup_repos() }}
# NOTE(huikang): non-root user does not work with libvirt.sock.
# Need configuration in nova-libvirt container to allow
diff --git a/kolla/docker/ceilometer/ceilometer-ipmi/Dockerfile.j2 b/kolla/docker/ceilometer/ceilometer-ipmi/Dockerfile.j2
index a767dc842..a86c01bac 100644
--- a/kolla/docker/ceilometer/ceilometer-ipmi/Dockerfile.j2
+++ b/kolla/docker/ceilometer/ceilometer-ipmi/Dockerfile.j2
@@ -7,6 +7,8 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}"
{% import "macros.j2" as macros with context %}
+{{ macros.kolla_enable_base_repos() }}
+
{% if base_package_type == 'rpm' %}
{% set ceilometer_ipmi_packages = [
'ipmitool'
@@ -23,5 +25,6 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}"
{% block ceilometer_ipmi_footer %}{% endblock %}
{% block footer %}{% endblock %}
+{{ macros.kolla_cleanup_repos() }}
USER ceilometer