Skip to content

Backport ovs repo build fix #590

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Alex-Welsh merged 1 commit into from
Sep 2, 2026
Merged

Backport ovs repo build fix #590

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions docker/ovn/ovn-base/Dockerfile.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,9 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
{{ macros.kolla_enable_base_repos() }}

{% if base_package_type == 'rpm' %}

{{ macros.enable_extra_repos(['openvswitch']) }}

{% set ovn_base_packages = [
'ovn${KOLLA_RPM_OVN_VERSION}',
] %}
Expand Down
3 changes: 3 additions & 0 deletions docker/ovn/ovn-controller/Dockerfile.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,9 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
{{ macros.kolla_enable_base_repos() }}

{% if base_package_type == 'rpm' %}

{{ macros.enable_extra_repos(['openvswitch']) }}

{% set ovn_controller_packages = [
'ovn${KOLLA_RPM_OVN_VERSION}-host'
] %}
Expand Down
3 changes: 3 additions & 0 deletions docker/ovn/ovn-nb-db-server/Dockerfile.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,9 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
{{ macros.kolla_enable_base_repos() }}

{% if base_package_type == 'rpm' %}

{{ macros.enable_extra_repos(['openvswitch']) }}

{% set ovn_nb_db_server_packages = [
'ovn${KOLLA_RPM_OVN_VERSION}-central',
] %}
Expand Down
3 changes: 3 additions & 0 deletions docker/ovn/ovn-northd/Dockerfile.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,9 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
{{ macros.kolla_enable_base_repos() }}

{% if base_package_type == 'rpm' %}

{{ macros.enable_extra_repos(['openvswitch']) }}

{% set ovn_northd_packages = [
'ovn${KOLLA_RPM_OVN_VERSION}-central',
] %}
Expand Down
3 changes: 3 additions & 0 deletions docker/ovn/ovn-sb-db-server/Dockerfile.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,9 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
{{ macros.kolla_enable_base_repos() }}

{% if base_package_type == 'rpm' %}

{{ macros.enable_extra_repos(['openvswitch']) }}

{% set ovn_sb_db_server_packages = [
'ovn${KOLLA_RPM_OVN_VERSION}-central',
] %}
Expand Down
6 changes: 6 additions & 0 deletions releasenotes/notes/bug-2163314-d99dd8d0f7a76a95.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
---
fixes:
- |
Fixes child image builds from ``openvswitch-base`` with a custom
OpenvSwitch repo.
`LP#2163314 <https://launchpad.net/bugs/2163314>`__
5 changes: 5 additions & 0 deletions tests/templates/repos.yaml.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,11 @@ rocky:
build_only: true
gpgkey: "file:///etc/pki/rpm-gpg/RPM-GPG-KEY-Rocky-10"
name: "crb"
openvswitch:
baseurl: "http://centos-stream.mirrorservice.org/SIGs/$releasever-stream/nfv/$basearch/openvswitch-2/"
build_only: true
gpgkey: "https://www.centos.org/keys/RPM-GPG-KEY-CentOS-SIG-NFV"
name: "centos-nfv-openvswitch"
{% elif base_distro == 'ubuntu' %}
ubuntu:
ubuntu:
Expand Down