diff options
| author | Michal Nasiadka <mnasiadka@gmail.com> | 2025-10-01 10:57:21 +0200 |
|---|---|---|
| committer | Michal Nasiadka <mnasiadka@gmail.com> | 2025-10-02 08:37:07 +0000 |
| commit | 17727e148120c43a5c7056b33e4277592376ccca (patch) | |
| tree | 74bed0e1645a19634e156ccaed23290a471e9718 /docker/nova | |
| parent | d4b777bb060517dbb0b648d5d7d5c07336969866 (diff) | |
| download | kolla-17727e148120c43a5c7056b33e4277592376ccca.tar.gz kolla-17727e148120c43a5c7056b33e4277592376ccca.zip | |
Move repo enablement to respective rpm blocks
Currently we are enabling repos irrespective of rpm/deb
statement blocks and not failing in the method used
if a repository is missing.
Downside is - we might be producing one more layer,
but it probably is a more logical approach.
This is required for adding rpm support in repos.yaml
that will also include failing on missing repositories.
Change-Id: I5479c5c935760f00fe4cd307366f261deee3199f
Signed-off-by: Michal Nasiadka <mnasiadka@gmail.com>
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', |