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/nova | |
| 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/nova')
| -rw-r--r-- | docker/nova/nova-base/Dockerfile.j2 | 3 | ||||
| -rw-r--r-- | docker/nova/nova-compute/Dockerfile.j2 | 4 | ||||
| -rw-r--r-- | docker/nova/nova-libvirt/Dockerfile.j2 | 4 |
3 files changed, 6 insertions, 5 deletions
diff --git a/docker/nova/nova-base/Dockerfile.j2 b/docker/nova/nova-base/Dockerfile.j2 index 747393944..f7ad8f0ad 100644 --- a/docker/nova/nova-base/Dockerfile.j2 +++ b/docker/nova/nova-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']) }} {{ macros.configure_user(name='nova', groups='qemu') }} {% if base_package_type == 'rpm' %} +{{ macros.enable_extra_repos(['openvswitch']) }} + {% set nova_base_packages = [ 'openvswitch${KOLLA_RPM_OVS_VERSION}', 'python3-openvswitch${KOLLA_RPM_OVS_VERSION}' diff --git a/docker/nova/nova-compute/Dockerfile.j2 b/docker/nova/nova-compute/Dockerfile.j2 index 1378b21e6..8c31461f3 100644 --- a/docker/nova/nova-compute/Dockerfile.j2 +++ b/docker/nova/nova-compute/Dockerfile.j2 @@ -7,10 +7,10 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build {% import "macros.j2" as macros with context %} -{{ macros.enable_extra_repos(['ceph', 'epel']) }} - {% if base_package_type == 'rpm' %} +{{ macros.enable_extra_repos(['ceph', 'epel']) }} + {% set nova_compute_packages = [ 'ceph-common', 'cyrus-sasl-md5', diff --git a/docker/nova/nova-libvirt/Dockerfile.j2 b/docker/nova/nova-libvirt/Dockerfile.j2 index ea165b100..d65d31584 100644 --- a/docker/nova/nova-libvirt/Dockerfile.j2 +++ b/docker/nova/nova-libvirt/Dockerfile.j2 @@ -9,10 +9,10 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build {{ macros.configure_user(name='nova', groups='qemu') }} -{{ macros.enable_extra_repos(['ceph', 'crb', 'epel', 'openvswitch']) }} - {% if base_package_type == 'rpm' %} +{{ macros.enable_extra_repos(['ceph', 'crb', 'epel', 'openvswitch']) }} + {% set nova_libvirt_packages = [ 'ceph-common', 'cyrus-sasl-md5', |