diff options
| author | Zuul <zuul@review.opendev.org> | 2025-10-02 12:50:04 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2025-10-02 12:50:04 +0000 |
| commit | 15c4e4d41665b06b1e29ae200e1d0171f14cd14b (patch) | |
| tree | b619d48a35e67a09b49fea843b24555bb46996f7 /docker/openvswitch | |
| parent | f17a23747f31305eed1be84569aac907fae15c19 (diff) | |
| parent | 17727e148120c43a5c7056b33e4277592376ccca (diff) | |
| download | kolla-15c4e4d41665b06b1e29ae200e1d0171f14cd14b.tar.gz kolla-15c4e4d41665b06b1e29ae200e1d0171f14cd14b.zip | |
Merge "Move repo enablement to respective rpm blocks"
Diffstat (limited to 'docker/openvswitch')
| -rw-r--r-- | docker/openvswitch/openvswitch-base/Dockerfile.j2 | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/docker/openvswitch/openvswitch-base/Dockerfile.j2 b/docker/openvswitch/openvswitch-base/Dockerfile.j2 index 1a40e846e..4400d4f1e 100644 --- a/docker/openvswitch/openvswitch-base/Dockerfile.j2 +++ b/docker/openvswitch/openvswitch-base/Dockerfile.j2 @@ -7,11 +7,12 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build {% import "macros.j2" as macros with context %} -{{ macros.enable_extra_repos(['openvswitch']) }} - {% block ovs_install %} {% if base_package_type == 'rpm' %} + +{{ macros.enable_extra_repos(['openvswitch']) }} + {% set openvswitch_base_packages = [ 'libibverbs', 'openvswitch${KOLLA_RPM_OVS_VERSION}', |