diff options
| author | Zuul <zuul@review.opendev.org> | 2024-04-24 11:24:44 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2024-04-24 11:24:44 +0000 |
| commit | e5024911f1865e86c77455699169f99f528ee38e (patch) | |
| tree | 8d9b2866f8631cb266012716a5f39f8b95851609 /docker | |
| parent | 179c57af519431169ab8881c93562bf6672248aa (diff) | |
| parent | abb969502f75517844bd44c25e0484c7495284d2 (diff) | |
| download | kolla-e5024911f1865e86c77455699169f99f528ee38e.tar.gz kolla-e5024911f1865e86c77455699169f99f528ee38e.zip | |
Merge "Nova: fix swtpm and swtpm-tools missing from deb installs"
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 bd8208f5a..0b99d3b13 100644 --- a/docker/nova/nova-compute/Dockerfile.j2 +++ b/docker/nova/nova-compute/Dockerfile.j2 @@ -72,6 +72,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 b56e01d0c..e29948741 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' ] %} |