Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Apply temporary fix for Caracal keystone builds #333

Merged
merged 20 commits into from
Aug 22, 2024
Merged

Apply temporary fix for Caracal keystone builds #333

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
073943c
Change target file path to absolute path
seunghun1ee Jul 22, 2024
4e2b021
Revert "Change target file path to absolute path"
seunghun1ee Jul 22, 2024
f5d3392
Try old symlinking
seunghun1ee Jul 22, 2024
fadd8a0
Revert "Try old symlinking"
seunghun1ee Jul 22, 2024
b3390b4
Ensure /requirement direcoty exists
seunghun1ee Jul 22, 2024
436654b
Use relative path instead
seunghun1ee Jul 22, 2024
46b89ad
try old symlinking but with relative path
seunghun1ee Jul 22, 2024
061e266
monitor directory
seunghun1ee Jul 22, 2024
598ea91
find upper-constraints.txt
seunghun1ee Jul 22, 2024
6369553
set correct symlink
seunghun1ee Jul 22, 2024
f3b5582
Use antelope symlinking
seunghun1ee Jul 22, 2024
8cc623e
Check after symlink
seunghun1ee Jul 22, 2024
dfdc6ae
Test symlink pattern matching
seunghun1ee Jul 23, 2024
dd27cfb
Fix directory for symlink checking
seunghun1ee Jul 23, 2024
2a75aef
Test inverse grep
seunghun1ee Jul 23, 2024
b10b231
Test moving out plugins
seunghun1ee Jul 24, 2024
0d6ebe8
Check keystone plugins
seunghun1ee Jul 25, 2024
05c006d
Use inverse grep again
seunghun1ee Jul 25, 2024
a9762c1
Add missing backslash
seunghun1ee Jul 25, 2024
958e70c
Try removing pycadf after pip install of openstack-base
seunghun1ee Jul 26, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions docker/keystone/keystone/Dockerfile.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,10 @@ ADD plugins-archive /
'requests-kerberos',
] %}

RUN echo $(ls -al /)

RUN echo $(ls -al /plugins)

COPY keystone_bootstrap.sh /usr/local/bin/kolla_keystone_bootstrap
COPY extend_start.sh /usr/local/bin/kolla_extend_start

Expand Down
9 changes: 6 additions & 3 deletions docker/openstack-base/Dockerfile.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -182,13 +182,13 @@ 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 \
RUN ln -s plugins/* /pycadf \
&& mkdir -p /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
is usually newer than UC entry and older version would get installed
Expand All @@ -211,6 +211,9 @@ ENV PATH /var/lib/kolla/venv/bin:$PATH
RUN {{ macros.install_pip(['pip', 'wheel', 'setuptools==67.2.*']) }} \
&& {{ macros.install_pip(openstack_base_pip_packages | customizable("pip_packages")) }}

RUN unlink /pycadf \
&& rm -rf plugins/*

{% if base_package_type == 'rpm' %}
RUN sed -i -r 's,^(Listen 80),#\1,' /etc/httpd/conf/httpd.conf \
&& sed -i -r 's,^(Listen 443),#\1,' /etc/httpd/conf.d/ssl.conf
Expand Down