openstack/kolla
Code Issues Proposed changes

Fix gnocchi and skyline after requirements change

Browse Source 
Global-requirements changed upper-constraints in [1].
Because of that change skyline and gnocchi build is now failing.

This patch fixes upper-constraints for those projects.

[1] https://review.opendev.org/c/openstack/requirements/+/900435

Change-Id: I09cc2635cd422a859ccded887affb58dfbdc60ad
This commit is contained in:
Michal Arbet 2024-01-23 08:42:25 +01:00
parent 1580d77821
commit 76d78b50c0
2 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docker/gnocchi/gnocchi-base/Dockerfile.j2
View File

@ -41,6 +41,8 @@ ADD gnocchi-base-archive /gnocchi-base-source
COPY extend_start.sh /usr/local/bin/kolla_extend_start COPY extend_start.sh /usr/local/bin/kolla_extend_start
COPY gnocchi_sudoers /etc/sudoers.d/kolla_gnocchi_sudoers COPY gnocchi_sudoers /etc/sudoers.d/kolla_gnocchi_sudoers
RUN {{ macros.upper_constraints_version_change("Werkzeug", "3.0.1", "2.2.3") }}
RUN ln -s gnocchi-base-source/* gnocchi \ RUN ln -s gnocchi-base-source/* gnocchi \
&& {{ macros.install_pip(gnocchi_base_pip_packages | customizable("pip_packages")) }} \ && {{ macros.install_pip(gnocchi_base_pip_packages | customizable("pip_packages")) }} \
&& mkdir -p /etc/gnocchi \ && mkdir -p /etc/gnocchi \

2
docker/skyline/skyline-base/Dockerfile.j2
View File

@ -14,4 +14,6 @@ COPY extend_start.sh /usr/local/bin/kolla_extend_start
RUN touch /usr/local/bin/kolla_skyline_extend_start \ RUN touch /usr/local/bin/kolla_skyline_extend_start \
&& chmod 644 /usr/local/bin/kolla_extend_start /usr/local/bin/kolla_skyline_extend_start && chmod 644 /usr/local/bin/kolla_extend_start /usr/local/bin/kolla_skyline_extend_start
RUN {{ macros.upper_constraints_version_change("SQLAlchemy", "1.4.50", "1.4.41") }}
{% block skyline_base_footer %}{% endblock %} {% block skyline_base_footer %}{% endblock %}