diff options
| author | Zuul <zuul@review.opendev.org> | 2026-09-02 09:46:27 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2026-09-02 09:46:27 +0000 |
| commit | a2515e086b43d859be67c8b1f4af82d4a75a5a1c (patch) | |
| tree | f1d8c5a43197a4d2e93934f060f3957fc3e6452f /kolla | |
| parent | 455303aef30d245485b34ac22cabd5ab3cab562c (diff) | |
| parent | 683b69e4ed4f3ac40d387320ce4ab0ed32a9bbbd (diff) | |
| download | kolla-a2515e086b43d859be67c8b1f4af82d4a75a5a1c.tar.gz kolla-a2515e086b43d859be67c8b1f4af82d4a75a5a1c.zip | |
Merge "Ensure openvswitch-base children get ovs repo"
Diffstat (limited to 'kolla')
| -rw-r--r-- | kolla/docker/ovn/ovn-base/Dockerfile.j2 | 3 | ||||
| -rw-r--r-- | kolla/docker/ovn/ovn-controller/Dockerfile.j2 | 3 | ||||
| -rw-r--r-- | kolla/docker/ovn/ovn-nb-db-server/Dockerfile.j2 | 3 | ||||
| -rw-r--r-- | kolla/docker/ovn/ovn-northd/Dockerfile.j2 | 3 | ||||
| -rw-r--r-- | kolla/docker/ovn/ovn-sb-db-server/Dockerfile.j2 | 3 |
5 files changed, 15 insertions, 0 deletions
diff --git a/kolla/docker/ovn/ovn-base/Dockerfile.j2 b/kolla/docker/ovn/ovn-base/Dockerfile.j2 index 9ab9f0aa6..96893782a 100644 --- a/kolla/docker/ovn/ovn-base/Dockerfile.j2 +++ b/kolla/docker/ovn/ovn-base/Dockerfile.j2 @@ -10,6 +10,9 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" {{ macros.kolla_enable_base_repos() }} {% if base_package_type == 'rpm' %} + +{{ macros.enable_extra_repos(['openvswitch']) }} + {% set ovn_base_packages = [ 'ovn${KOLLA_RPM_OVN_VERSION}', ] %} diff --git a/kolla/docker/ovn/ovn-controller/Dockerfile.j2 b/kolla/docker/ovn/ovn-controller/Dockerfile.j2 index a04562107..b70db50e6 100644 --- a/kolla/docker/ovn/ovn-controller/Dockerfile.j2 +++ b/kolla/docker/ovn/ovn-controller/Dockerfile.j2 @@ -10,6 +10,9 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" {{ 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' ] %} diff --git a/kolla/docker/ovn/ovn-nb-db-server/Dockerfile.j2 b/kolla/docker/ovn/ovn-nb-db-server/Dockerfile.j2 index 932d7a5d7..472c6e8c9 100644 --- a/kolla/docker/ovn/ovn-nb-db-server/Dockerfile.j2 +++ b/kolla/docker/ovn/ovn-nb-db-server/Dockerfile.j2 @@ -10,6 +10,9 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" {{ 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', ] %} diff --git a/kolla/docker/ovn/ovn-northd/Dockerfile.j2 b/kolla/docker/ovn/ovn-northd/Dockerfile.j2 index 227584ed4..6a9c1b03f 100644 --- a/kolla/docker/ovn/ovn-northd/Dockerfile.j2 +++ b/kolla/docker/ovn/ovn-northd/Dockerfile.j2 @@ -10,6 +10,9 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" {{ 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', ] %} diff --git a/kolla/docker/ovn/ovn-sb-db-server/Dockerfile.j2 b/kolla/docker/ovn/ovn-sb-db-server/Dockerfile.j2 index fbef63713..419622389 100644 --- a/kolla/docker/ovn/ovn-sb-db-server/Dockerfile.j2 +++ b/kolla/docker/ovn/ovn-sb-db-server/Dockerfile.j2 @@ -10,6 +10,9 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" {{ 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', ] %} |