diff options
| author | Zuul <zuul@review.opendev.org> | 2024-08-23 16:59:42 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2024-08-23 16:59:42 +0000 |
| commit | fd1e4501e3d369f03998d3699d0f617a99886cf1 (patch) | |
| tree | 453daeb279f4cbf7c2614fd92f3db9b219372566 /docker | |
| parent | fe00de50c46cff091e71a5db987ee2a7c0b5c158 (diff) | |
| parent | 56de572119b37a64f42b5399f966ebc18f8be223 (diff) | |
| download | kolla-fd1e4501e3d369f03998d3699d0f617a99886cf1.tar.gz kolla-fd1e4501e3d369f03998d3699d0f617a99886cf1.zip | |
Merge "nova: Drop xen remnants"
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/nova/nova-libvirt/Dockerfile.j2 | 3 | ||||
| -rw-r--r-- | docker/nova/nova-libvirt/extend_start.sh | 5 |
2 files changed, 1 insertions, 7 deletions
diff --git a/docker/nova/nova-libvirt/Dockerfile.j2 b/docker/nova/nova-libvirt/Dockerfile.j2 index e29948741..f181c8762 100644 --- a/docker/nova/nova-libvirt/Dockerfile.j2 +++ b/docker/nova/nova-libvirt/Dockerfile.j2 @@ -78,8 +78,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build {% if base_arch in ['aarch64', 'x86_64'] %} {% set nova_libvirt_packages = nova_libvirt_packages + [ - 'dmidecode', - 'xen-utils' + 'dmidecode' ] %} {% endif %} diff --git a/docker/nova/nova-libvirt/extend_start.sh b/docker/nova/nova-libvirt/extend_start.sh index 2149ac178..cc41b480b 100644 --- a/docker/nova/nova-libvirt/extend_start.sh +++ b/docker/nova/nova-libvirt/extend_start.sh @@ -1,10 +1,5 @@ #!/bin/bash -# Mount xenfs for libxl to work -if [[ $(lsmod | grep xenfs) ]]; then - mount -t xenfs xenfs /proc/xen -fi - if [[ ! -e "/var/log/kolla/libvirt/libvirtd.log" ]]; then mkdir -p /var/log/kolla/libvirt touch /var/log/kolla/libvirt/libvirtd.log |