aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZuul <zuul@review.opendev.org>2024-12-11 10:07:33 +0000
committerGerrit Code Review <review@openstack.org>2024-12-11 10:07:33 +0000
commitda7562c73fb4139a6a32a2137850e371782a1390 (patch)
tree69901ec5206f93e6a2393e29c353108a636cec13
parent33f5eb260bf1828bca83344bf9de654c1577e0be (diff)
parent795e347853c090d0067c6d309b112414b0c7c5c7 (diff)
downloadkolla-da7562c73fb4139a6a32a2137850e371782a1390.tar.gz
kolla-da7562c73fb4139a6a32a2137850e371782a1390.zip
Merge "Revert "[release] Use Dalmatian sources by default""
-rw-r--r--docker/designate/designate-base/Dockerfile.j21
-rw-r--r--docker/skyline/skyline-apiserver/Dockerfile.j22
-rw-r--r--kolla/common/config.py2
-rw-r--r--kolla/common/sources.py2
4 files changed, 4 insertions, 3 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
diff --git a/kolla/common/config.py b/kolla/common/config.py
index 92b4d5a93..7ac3e8617 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'
# This is noarch repository so we will use it on all architectures
DELOREAN_DEPS = "https://trunk.rdoproject.org/centos9-master/" \
diff --git a/kolla/common/sources.py b/kolla/common/sources.py
index ac73f422d..71f741d4e 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/'