diff options
| author | Zuul <zuul@review.opendev.org> | 2025-08-29 17:42:02 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2025-08-29 17:42:02 +0000 |
| commit | 8e720b388e5717ad93d9ad0c2a3c3fc51e4fc111 (patch) | |
| tree | 015fcf00347177926e68b6a634edfa7386e26193 /docker/nova | |
| parent | da1f630158a2aeca53300501188942071dcb4c64 (diff) | |
| parent | 5781b359efc32726645a7d5d5570bcec9f0035fa (diff) | |
| download | kolla-8e720b388e5717ad93d9ad0c2a3c3fc51e4fc111.tar.gz kolla-8e720b388e5717ad93d9ad0c2a3c3fc51e4fc111.zip | |
Merge "Remove RDO/Delorean"
Diffstat (limited to 'docker/nova')
| -rw-r--r-- | docker/nova/nova-base/Dockerfile.j2 | 4 | ||||
| -rw-r--r-- | docker/nova/nova-libvirt/Dockerfile.j2 | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/docker/nova/nova-base/Dockerfile.j2 b/docker/nova/nova-base/Dockerfile.j2 index 702747976..747393944 100644 --- a/docker/nova/nova-base/Dockerfile.j2 +++ b/docker/nova/nova-base/Dockerfile.j2 @@ -13,8 +13,8 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build {% if base_package_type == 'rpm' %} {% set nova_base_packages = [ - 'openvswitch', - 'python3-openvswitch' + 'openvswitch${KOLLA_RPM_OVS_VERSION}', + 'python3-openvswitch${KOLLA_RPM_OVS_VERSION}' ] %} {% if base_arch == 'x86_64' %} {% set nova_base_packages = nova_base_packages + [ diff --git a/docker/nova/nova-libvirt/Dockerfile.j2 b/docker/nova/nova-libvirt/Dockerfile.j2 index 2942ede41..ea165b100 100644 --- a/docker/nova/nova-libvirt/Dockerfile.j2 +++ b/docker/nova/nova-libvirt/Dockerfile.j2 @@ -23,7 +23,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build 'libvirt-daemon-config-nwfilter', 'libvirt-daemon-driver-nwfilter', 'libvirt-daemon-driver-nodedev', - 'openvswitch', + 'openvswitch${KOLLA_RPM_OVS_VERSION}', 'qemu-img', 'qemu-kvm', 'swtpm', |