From 795e347853c090d0067c6d309b112414b0c7c5c7 Mon Sep 17 00:00:00 2001
From: Michal Nasiadka <mnasiadka@gmail.com>
Date: Fri, 29 Nov 2024 11:12:42 +0000
Subject: [PATCH] Revert "[release] Use Dalmatian sources by default"

This reverts commit 5af5febf50bc0a02422b437b16598570d0c5ffe3.

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
---
 docker/designate/designate-base/Dockerfile.j2  | 1 -
 docker/skyline/skyline-apiserver/Dockerfile.j2 | 2 ++
 kolla/common/config.py                         | 2 +-
 kolla/common/sources.py                        | 2 +-
 4 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/docker/designate/designate-base/Dockerfile.j2 b/docker/designate/designate-base/Dockerfile.j2
index d909e0e801..35bfa81e95 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 00c871165b..a34178a853 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
 
diff --git a/kolla/common/config.py b/kolla/common/config.py
index 3075052ad8..7372d388c5 100644
--- a/kolla/common/config.py
+++ b/kolla/common/config.py
@@ -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
diff --git a/kolla/common/sources.py b/kolla/common/sources.py
index ac73f422d7..71f741d4eb 100644
--- a/kolla/common/sources.py
+++ b/kolla/common/sources.py
@@ -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/'