diff options
| author | Zuul <zuul@review.opendev.org> | 2024-12-11 10:07:33 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2024-12-11 10:07:33 +0000 |
| commit | da7562c73fb4139a6a32a2137850e371782a1390 (patch) | |
| tree | 69901ec5206f93e6a2393e29c353108a636cec13 /docker | |
| parent | 33f5eb260bf1828bca83344bf9de654c1577e0be (diff) | |
| parent | 795e347853c090d0067c6d309b112414b0c7c5c7 (diff) | |
| download | kolla-da7562c73fb4139a6a32a2137850e371782a1390.tar.gz kolla-da7562c73fb4139a6a32a2137850e371782a1390.zip | |
Merge "Revert "[release] Use Dalmatian sources by default""
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/designate/designate-base/Dockerfile.j2 | 1 | ||||
| -rw-r--r-- | docker/skyline/skyline-apiserver/Dockerfile.j2 | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/docker/designate/designate-base/Dockerfile.j2 b/docker/designate/designate-base/Dockerfile.j2 index d909e0e80..35bfa81e9 100644 --- a/docker/designate/designate-base/Dockerfile.j2 +++ b/docker/designate/designate-base/Dockerfile.j2 @@ -22,7 +22,6 @@ RUN ln -s designate-base-source/* designate \ && {{ macros.install_pip(designate_base_pip_packages | customizable("pip_packages")) }} \ && mkdir -p /etc/designate \ && cp -r /designate/etc/designate/* /etc/designate/ \ - && mv /etc/designate/rootwrap.conf.sample /etc/designate/rootwrap.conf \ && sed -i 's|^exec_dirs.*|exec_dirs=/var/lib/kolla/venv/bin,/sbin,/usr/sbin,/bin,/usr/bin,/usr/local/bin,/usr/local/sbin|g' /etc/designate/rootwrap.conf \ && chmod 750 /etc/sudoers.d \ && chmod 640 /etc/sudoers.d/kolla_designate_sudoers \ diff --git a/docker/skyline/skyline-apiserver/Dockerfile.j2 b/docker/skyline/skyline-apiserver/Dockerfile.j2 index 00c871165..a34178a85 100644 --- a/docker/skyline/skyline-apiserver/Dockerfile.j2 +++ b/docker/skyline/skyline-apiserver/Dockerfile.j2 @@ -16,6 +16,8 @@ ADD skyline-apiserver-archive /skyline-apiserver-source COPY extend_start.sh /usr/local/bin/kolla_skyline_extend_start RUN ln -s skyline-apiserver-source/* skyline-apiserver \ +{# TODO: Remove when https://review.opendev.org/c/openstack/skyline-apiserver/+/935604 is merged #} + && {{ macros.upper_constraints_remove("aiosqlite") }} \ && {{ macros.install_pip(skyline_apiserver_pip_packages | customizable("pip_packages")) }} \ && chmod 644 /usr/local/bin/kolla_skyline_extend_start |