diff options
| author | Marcin Juszkiewicz <marcin.juszkiewicz+kolla@linaro.org> | 2023-03-27 16:55:04 +0200 |
|---|---|---|
| committer | Marcin Juszkiewicz <marcin.juszkiewicz+kolla@linaro.org> | 2023-04-21 14:13:24 +0200 |
| commit | 19e40f160852a3519f3e58043b9b5555ca87f87d (patch) | |
| tree | 6888eb38c08a5ee00a96fa63eb1f81c164667fb6 /docker/ceilometer | |
| parent | 2b0a5f684b80fcd85bfe12a51f899407e06741b8 (diff) | |
| download | kolla-19e40f160852a3519f3e58043b9b5555ca87f87d.tar.gz kolla-19e40f160852a3519f3e58043b9b5555ca87f87d.zip | |
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
Diffstat (limited to 'docker/ceilometer')
| -rw-r--r-- | docker/ceilometer/ceilometer-base/Dockerfile.j2 | 2 |
1 files changed, 1 insertions, 1 deletions
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/ \ |