Fix symlinking of openstack-base source

Original symlinking works fine with a tarball source for the
requirements repo.

However, when user supplies git type source of it, we cannot
guarantee that the source direcotry name contains ``requirements``.

This patch fixes it by moving plugins directory outside of
openstack-base directory, which ultimately allow us to use simpler
symlinking as openstack-base-archive would be the only directory
inside.

Closes-Bug: #2074075
Change-Id: I5a9162a30b23cfabb64dabe5c12c226fa8627abd
This commit is contained in:
Seunghun Lee 2024-07-23 16:58:09 +01:00 committed by Michal Nasiadka
parent 082d90cca0
commit 978a2864f9
2 changed files with 11 additions and 6 deletions

View File

@ -135,7 +135,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
'pika', 'pika',
'prettytable', 'prettytable',
'psutil', 'psutil',
'/pycadf', '/plugins/pycadf*',
'pyinotify', 'pyinotify',
'pymysql', 'pymysql',
'pyngus', 'pyngus',
@ -182,13 +182,12 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
%} %}
ADD openstack-base-archive /openstack-base-source ADD openstack-base-archive /openstack-base-source
ADD plugins-archive /openstack-base-source ADD plugins-archive /
RUN ln -s openstack-base-source/plugins/* /pycadf \ RUN mkdir -p /etc/pycadf \
&& mkdir -p /etc/pycadf \ && cp /plugins/pycadf*/etc/pycadf/* /etc/pycadf/
&& cp /pycadf/etc/pycadf/* /etc/pycadf/
RUN ln -s openstack-base-source/*requirements* /requirements \ RUN ln -s openstack-base-source/* /requirements \
{# NOTE(mnasiadka): Remove ovs from upper-constraints.txt because python3-openvswitch {# NOTE(mnasiadka): Remove ovs from upper-constraints.txt because python3-openvswitch
is usually newer than UC entry and older version would get installed is usually newer than UC entry and older version would get installed

View File

@ -0,0 +1,6 @@
---
fixes:
- |
Fixed a bug preventing image builds when requirements are provided from
git type source.
`LP#2074075 <https://bugs.launchpad.net/kolla/+bug/2074075>`__