Merge "Revert "[release] Use Dalmatian sources by default""

Author: Zuul

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 \

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
 

kolla/common/config.py

@@ -37,7 +37,7 @@
     'rocky': 'Rocky Linux 9.* (Blue Onyx)',
     'ubuntu': 'Ubuntu 24.04.* LTS',
 }
-OPENSTACK_RELEASE = '2024.2'
+OPENSTACK_RELEASE = 'master'
 
 # This is noarch repository so we will use it on all architectures
 DELOREAN_DEPS = "https://trunk.rdoproject.org/centos9-master/" \

kolla/common/sources.py

@@ -18,7 +18,7 @@
     '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/'