diff options
| author | Seunghun Lee <seunghun@stackhpc.com> | 2024-07-23 16:58:09 +0100 |
|---|---|---|
| committer | Michal Nasiadka <mnasiadka@gmail.com> | 2024-08-29 23:38:29 +0000 |
| commit | 978a2864f923fa2e65afa13808571ea7738729e6 (patch) | |
| tree | 4f23bf656d2dc0612fd85f85f162362a0eb5538f | |
| parent | 082d90cca02b0e3935363c7ce2e7ae718bcbb789 (diff) | |
| download | kolla-978a2864f923fa2e65afa13808571ea7738729e6.tar.gz kolla-978a2864f923fa2e65afa13808571ea7738729e6.zip | |
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
| -rw-r--r-- | docker/openstack-base/Dockerfile.j2 | 11 | ||||
| -rw-r--r-- | releasenotes/notes/fix-git-build-23c8fe6c4b0d92c4.yaml | 6 |
2 files changed, 11 insertions, 6 deletions
diff --git a/docker/openstack-base/Dockerfile.j2 b/docker/openstack-base/Dockerfile.j2 index df03aaced..1df4321e5 100644 --- a/docker/openstack-base/Dockerfile.j2 +++ b/docker/openstack-base/Dockerfile.j2 @@ -135,7 +135,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build 'pika', 'prettytable', 'psutil', - '/pycadf', + '/plugins/pycadf*', 'pyinotify', 'pymysql', 'pyngus', @@ -182,13 +182,12 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build %} ADD openstack-base-archive /openstack-base-source -ADD plugins-archive /openstack-base-source +ADD plugins-archive / -RUN ln -s openstack-base-source/plugins/* /pycadf \ - && mkdir -p /etc/pycadf \ - && cp /pycadf/etc/pycadf/* /etc/pycadf/ +RUN mkdir -p /etc/pycadf \ + && cp /plugins/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 is usually newer than UC entry and older version would get installed diff --git a/releasenotes/notes/fix-git-build-23c8fe6c4b0d92c4.yaml b/releasenotes/notes/fix-git-build-23c8fe6c4b0d92c4.yaml new file mode 100644 index 000000000..e89710b75 --- /dev/null +++ b/releasenotes/notes/fix-git-build-23c8fe6c4b0d92c4.yaml @@ -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>`__ |