Skip to content

Commit 795e347

Browse files
committed
Revert "[release] Use Dalmatian sources by default"
This reverts commit 5af5feb. 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
1 parent f57457f commit 795e347

File tree

4 files changed

+4
-3
lines changed

4 files changed

+4
-3
lines changed

docker/designate/designate-base/Dockerfile.j2

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ RUN ln -s designate-base-source/* designate \
2222
&& {{ macros.install_pip(designate_base_pip_packages | customizable("pip_packages")) }} \
2323
&& mkdir -p /etc/designate \
2424
&& cp -r /designate/etc/designate/* /etc/designate/ \
25-
&& mv /etc/designate/rootwrap.conf.sample /etc/designate/rootwrap.conf \
2625
&& 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 \
2726
&& chmod 750 /etc/sudoers.d \
2827
&& chmod 640 /etc/sudoers.d/kolla_designate_sudoers \

docker/skyline/skyline-apiserver/Dockerfile.j2

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,8 @@ ADD skyline-apiserver-archive /skyline-apiserver-source
1616
COPY extend_start.sh /usr/local/bin/kolla_skyline_extend_start
1717

1818
RUN ln -s skyline-apiserver-source/* skyline-apiserver \
19+
{# TODO: Remove when https://review.opendev.org/c/openstack/skyline-apiserver/+/935604 is merged #}
20+
&& {{ macros.upper_constraints_remove("aiosqlite") }} \
1921
&& {{ macros.install_pip(skyline_apiserver_pip_packages | customizable("pip_packages")) }} \
2022
&& chmod 644 /usr/local/bin/kolla_skyline_extend_start
2123

kolla/common/config.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
'rocky': 'Rocky Linux 9.* (Blue Onyx)',
3838
'ubuntu': 'Ubuntu 24.04.* LTS',
3939
}
40-
OPENSTACK_RELEASE = '2024.2'
40+
OPENSTACK_RELEASE = 'master'
4141

4242
# TODO(mandre) check for file integrity instead of downloading from an HTTPS
4343
# source

kolla/common/sources.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
'openstack-base-plugin-pycadf': {
1919
'type': 'url',
2020
'location': ('$tarballs_base/openstack/pycadf/'
21-
'pycadf-3.1.1.tar.gz')},
21+
'pycadf-4.0.0.tar.gz')},
2222
'aodh-base': {
2323
'type': 'url',
2424
'location': ('$tarballs_base/openstack/aodh/'

0 commit comments

Comments
 (0)