diff options
| author | Zuul <zuul@review.opendev.org> | 2025-07-17 11:54:34 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2025-07-17 11:54:34 +0000 |
| commit | 5d2dfc0eb9fac7d22a04665173fe650b61985d19 (patch) | |
| tree | 8962ae2c35df1ae753ccaa14e1084e73e02dda66 /docker/nova | |
| parent | ba2b4bb56415b9bd7b690dcf077bb59cf4083f05 (diff) | |
| parent | 9e36b8976657e5aaf285f4ab9f65603ab475fd89 (diff) | |
| download | kolla-5d2dfc0eb9fac7d22a04665173fe650b61985d19.tar.gz kolla-5d2dfc0eb9fac7d22a04665173fe650b61985d19.zip | |
Merge "Move to CentOS Stream 10"
Diffstat (limited to 'docker/nova')
| -rw-r--r-- | docker/nova/nova-compute-ironic/Dockerfile.j2 | 2 | ||||
| -rw-r--r-- | docker/nova/nova-libvirt/Dockerfile.j2 | 2 | ||||
| -rw-r--r-- | docker/nova/nova-ssh/extend_start.sh | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/docker/nova/nova-compute-ironic/Dockerfile.j2 b/docker/nova/nova-compute-ironic/Dockerfile.j2 index 56d1f0abd..b248025c8 100644 --- a/docker/nova/nova-compute-ironic/Dockerfile.j2 +++ b/docker/nova/nova-compute-ironic/Dockerfile.j2 @@ -7,7 +7,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build {% import "macros.j2" as macros with context %} -{% set nova_compute_ironic_packages = ['genisoimage', 'nvme-cli'] %} +{% set nova_compute_ironic_packages = ['xorriso', 'nvme-cli'] %} {{ macros.install_packages(nova_compute_ironic_packages | customizable("packages")) }} diff --git a/docker/nova/nova-libvirt/Dockerfile.j2 b/docker/nova/nova-libvirt/Dockerfile.j2 index f738fdc35..2942ede41 100644 --- a/docker/nova/nova-libvirt/Dockerfile.j2 +++ b/docker/nova/nova-libvirt/Dockerfile.j2 @@ -9,7 +9,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build {{ macros.configure_user(name='nova', groups='qemu') }} -{{ macros.enable_extra_repos(['ceph', 'epel', 'openvswitch']) }} +{{ macros.enable_extra_repos(['ceph', 'crb', 'epel', 'openvswitch']) }} {% if base_package_type == 'rpm' %} diff --git a/docker/nova/nova-ssh/extend_start.sh b/docker/nova/nova-ssh/extend_start.sh index 6d52952a7..b80114c0a 100644 --- a/docker/nova/nova-ssh/extend_start.sh +++ b/docker/nova/nova-ssh/extend_start.sh @@ -1,6 +1,6 @@ #!/bin/bash -SSH_HOST_KEY_TYPES=( "rsa" "dsa" "ecdsa" "ed25519" ) +SSH_HOST_KEY_TYPES=( "rsa" "ecdsa" "ed25519" ) for key_type in ${SSH_HOST_KEY_TYPES[@]}; do KEY_PATH=/etc/ssh/ssh_host_${key_type}_key |