diff options
| author | Zuul <zuul@review.opendev.org> | 2021-07-26 10:36:58 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2021-07-26 10:36:58 +0000 |
| commit | d90d87d17e629dfe4bce9572e9085c5178433906 (patch) | |
| tree | a37c220a75752ddb10a0e9de7864df00f80abf44 | |
| parent | 2d8b79c8b163cd3f3a556ed59b301d60493c1ca1 (diff) | |
| parent | fb218ff9bf3803188991ae0f1a8f66ffa5176872 (diff) | |
| download | kolla-d90d87d17e629dfe4bce9572e9085c5178433906.tar.gz kolla-d90d87d17e629dfe4bce9572e9085c5178433906.zip | |
Merge "Fix missing templating block for kolla-toolbox."
| -rw-r--r-- | docker/kolla-toolbox/Dockerfile.j2 | 2 | ||||
| -rw-r--r-- | releasenotes/notes/add_kolla-toolbox_templating_block-3d284d886816e95a.yml | 5 |
2 files changed, 7 insertions, 0 deletions
diff --git a/docker/kolla-toolbox/Dockerfile.j2 b/docker/kolla-toolbox/Dockerfile.j2 index a8c013778..fcee30cb3 100644 --- a/docker/kolla-toolbox/Dockerfile.j2 +++ b/docker/kolla-toolbox/Dockerfile.j2 @@ -72,10 +72,12 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build 'virtualenv' ] %} +{% block kolla_toolbox_upper_constraints %} RUN mkdir -p /requirements \ && curl -o /requirements/upper-constraints.txt https://releases.openstack.org/constraints/upper/{{ openstack_release }} \ && {{ macros.install_pip(kolla_toolbox_pip_virtualenv_packages | customizable("pip_virtualenv_packages")) }} \ && virtualenv --system-site-packages {{ virtualenv_path }} +{% endblock %} ENV PATH {{ virtualenv_path }}/bin:$PATH diff --git a/releasenotes/notes/add_kolla-toolbox_templating_block-3d284d886816e95a.yml b/releasenotes/notes/add_kolla-toolbox_templating_block-3d284d886816e95a.yml new file mode 100644 index 000000000..4fd78af68 --- /dev/null +++ b/releasenotes/notes/add_kolla-toolbox_templating_block-3d284d886816e95a.yml @@ -0,0 +1,5 @@ +--- +features: + - | + Add templating block for kolla-toolbox image helping to customize + upper-constraints URL used at build time for offline build scenario. |