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/openstack-base/Dockerfile.j2 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'docker/openstack-base') diff --git a/docker/openstack-base/Dockerfile.j2 b/docker/openstack-base/Dockerfile.j2 index f157d8ff7..fd974314d 100644 --- a/docker/openstack-base/Dockerfile.j2 +++ b/docker/openstack-base/Dockerfile.j2 @@ -190,7 +190,7 @@ RUN ln -s openstack-base-source/* /requirements \ is usually newer than UC entry and older version would get installed in venv (see https://launchpad.net/bugs/1961874). #} - && sed -i /^ovs=/d /requirements/upper-constraints.txt \ + && {{ macros.upper_constraints_remove("ovs") }} \ && mkdir -p /var/lib/kolla \ && python3 -m venv --system-site-packages /var/lib/kolla/venv -- cgit v1.2.3