diff options
| author | Zuul <zuul@review.opendev.org> | 2024-05-09 12:52:56 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2024-05-09 12:52:56 +0000 |
| commit | 3653011b0a9e00e85c07bbe0b6e226a1efaa5f33 (patch) | |
| tree | fd938bbe6ca9945f4af744f6a2b60d4b871040e5 /docker | |
| parent | 13949dd4f1799d89f7edd03cb01d5f323c563fdc (diff) | |
| parent | 99ccc25e8a4d1e51f3d7f14258e9bb6f6bab688f (diff) | |
| download | kolla-3653011b0a9e00e85c07bbe0b6e226a1efaa5f33.tar.gz kolla-3653011b0a9e00e85c07bbe0b6e226a1efaa5f33.zip | |
Merge "Nova: fix swtpm and swtpm-tools missing from deb installs" into unmaintained/zed
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/nova/nova-compute/Dockerfile.j2 | 2 | ||||
| -rw-r--r-- | docker/nova/nova-libvirt/Dockerfile.j2 | 1 |
2 files changed, 3 insertions, 0 deletions
diff --git a/docker/nova/nova-compute/Dockerfile.j2 b/docker/nova/nova-compute/Dockerfile.j2 index d013e00b5..d1df0318e 100644 --- a/docker/nova/nova-compute/Dockerfile.j2 +++ b/docker/nova/nova-compute/Dockerfile.j2 @@ -71,6 +71,8 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build 'qemu-utils', 'rsync', 'sasl2-bin', + 'swtpm', + 'swtpm-tools', 'sysfsutils', 'targetcli-fb', 'xfsprogs' diff --git a/docker/nova/nova-libvirt/Dockerfile.j2 b/docker/nova/nova-libvirt/Dockerfile.j2 index 6bf1ee471..d8e05ee9b 100644 --- a/docker/nova/nova-libvirt/Dockerfile.j2 +++ b/docker/nova/nova-libvirt/Dockerfile.j2 @@ -56,6 +56,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build 'qemu-utils', 'sasl2-bin', 'swtpm', + 'swtpm-tools', 'trousers' ] %} |