From 19e40f160852a3519f3e58043b9b5555ca87f87d Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Mon, 27 Mar 2023 16:55:04 +0200 Subject: docker: implement macros to alter upper-constraints.txt upper_constraints_remove() macro allows to remove line upper_constraints_version_change() allows to change versions This way we have cleaner way to alter u-c in those images which need it. Change-Id: I8fc354b8aa4d03fcd3ecfb9cbfe75de67492a0e3 --- docker/ceilometer/ceilometer-base/Dockerfile.j2 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'docker/ceilometer') diff --git a/docker/ceilometer/ceilometer-base/Dockerfile.j2 b/docker/ceilometer/ceilometer-base/Dockerfile.j2 index cbae0fe38..93b7f6d41 100644 --- a/docker/ceilometer/ceilometer-base/Dockerfile.j2 +++ b/docker/ceilometer/ceilometer-base/Dockerfile.j2 @@ -25,7 +25,7 @@ COPY extend_start.sh /usr/local/bin/kolla_extend_start # NOTE(egonzalez): Remove ceilometer from constraint or will fail. RUN ln -s ceilometer-base-source/* ceilometer \ - && sed -i 's|^ceilometer===.*$||g' requirements/upper-constraints.txt \ + && {{ macros.upper_constraints_remove("ceilometer") }} \ && {{ macros.install_pip(ceilometer_base_pip_packages | customizable("pip_packages")) }} \ && mkdir -p /etc/ceilometer \ && cp -r /ceilometer/etc/ceilometer/* /etc/ceilometer/ \ -- cgit v1.2.3