From 76a35ea47ba1e07aaa0ccf3a448996197c4166e4 Mon Sep 17 00:00:00 2001 From: Michal Arbet Date: Wed, 18 Nov 2026 00:52:51 +0100 Subject: Fix ovs repository and designate rootrap This commit contains two squashed commits to unblock CI at once, commits below: Fix openvswitch repository on Rocky Linux 10.3 Rocky Linux 10.3 removed the stream dnf variable from rocky-repos, so $stream is not expanded anymore and building images which install openvswitch fails with 404 from the CentOS NFV SIG metalink. This patch uses $releasever-stream instead, the same as the repository file shipped by centos-release-nfv-openvswitch. Remove rootwrap from designate-base image Designate dropped oslo.rootwrap, including rootwrap.conf and the designate-rootwrap executable [1], so building the designate-base image fails on a missing /etc/designate/rootwrap.conf. This patch removes the rootwrap.conf modification and the designate sudoers file. [1] https://review.opendev.org/c/openstack/designate/+/1012260 Closes-Bug: #2174784 Change-Id: Ib025c76d403994bf9cd3b90373ea27320530ea2f Signed-off-by: Michal Arbet --- kolla/docker/designate/designate-base/Dockerfile.j2 | 4 ---- kolla/docker/designate/designate-base/designate_sudoers | 1 - kolla/template/repos.yaml | 2 +- 3 files changed, 1 insertion(+), 6 deletions(-) delete mode 100644 kolla/docker/designate/designate-base/designate_sudoers diff --git a/kolla/docker/designate/designate-base/Dockerfile.j2 b/kolla/docker/designate/designate-base/Dockerfile.j2 index 46836d931..7cd2d4377 100644 --- a/kolla/docker/designate/designate-base/Dockerfile.j2 +++ b/kolla/docker/designate/designate-base/Dockerfile.j2 @@ -17,16 +17,12 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" ADD designate-base-archive /designate-base-source -COPY designate_sudoers /etc/sudoers.d/kolla_designate_sudoers COPY extend_start.sh /usr/local/bin/kolla_extend_start 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/ \ - && 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 \ && touch /usr/local/bin/kolla_designate_extend_start \ && chmod 644 /usr/local/bin/kolla_extend_start /usr/local/bin/kolla_designate_extend_start diff --git a/kolla/docker/designate/designate-base/designate_sudoers b/kolla/docker/designate/designate-base/designate_sudoers deleted file mode 100644 index d06679fe2..000000000 --- a/kolla/docker/designate/designate-base/designate_sudoers +++ /dev/null @@ -1 +0,0 @@ -%kolla ALL=(root) NOPASSWD: /var/lib/kolla/venv/bin/designate-rootwrap /etc/designate/rootwrap.conf * diff --git a/kolla/template/repos.yaml b/kolla/template/repos.yaml index 71db00a30..04e5e05e7 100644 --- a/kolla/template/repos.yaml +++ b/kolla/template/repos.yaml @@ -177,7 +177,7 @@ rpm: name: "opensearch-dashboards-3.x" openvswitch: gpgkey: "https://www.centos.org/keys/RPM-GPG-KEY-CentOS-SIG-NFV" - metalink: "https://mirrors.centos.org/metalink?repo=centos-nfv-sig-openvswitch-2-$stream&arch=$basearch&protocol=https,http" + metalink: "https://mirrors.centos.org/metalink?repo=centos-nfv-sig-openvswitch-2-$releasever-stream&arch=$basearch&protocol=https,http" name: "centos-nfv-openvswitch" opstools: distro: True -- cgit v1.2.3