Revert "[release] Use Dalmatian sources by default"

This reverts commit 5af5febf50.

Reason for revert: Epoxy cycle is on

In addition to the revert skyline-apiserver aiosqlite u-c
is removed until [1] is merged, designate rootwrap.conf.sample
file has been renamed to rootwrap.conf and pycadf is bumped to 4.0.0.

[1]: https://review.opendev.org/c/openstack/skyline-apiserver/+/935604

Change-Id: I1265633f0913b7927955564fac911a682615004a
This commit is contained in:
Michal Nasiadka
2024-11-29 11:12:42 +00:00
parent f57457f906
commit 795e347853
4 changed files with 4 additions and 3 deletions

View File

@@ -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 \

View File

@@ -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

View File

@@ -37,7 +37,7 @@ DISTRO_PRETTY_NAME = {
'rocky': 'Rocky Linux 9.* (Blue Onyx)',
'ubuntu': 'Ubuntu 24.04.* LTS',
}
OPENSTACK_RELEASE = '2024.2'
OPENSTACK_RELEASE = 'master'
# TODO(mandre) check for file integrity instead of downloading from an HTTPS
# source

View File

@@ -18,7 +18,7 @@ SOURCES = {
'openstack-base-plugin-pycadf': {
'type': 'url',
'location': ('$tarballs_base/openstack/pycadf/'
'pycadf-3.1.1.tar.gz')},
'pycadf-4.0.0.tar.gz')},
'aodh-base': {
'type': 'url',
'location': ('$tarballs_base/openstack/aodh/'