summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZuul <zuul@review.opendev.org>2024-05-09 12:52:56 +0000
committerGerrit Code Review <review@openstack.org>2024-05-09 12:52:56 +0000
commit3653011b0a9e00e85c07bbe0b6e226a1efaa5f33 (patch)
treefd938bbe6ca9945f4af744f6a2b60d4b871040e5
parent13949dd4f1799d89f7edd03cb01d5f323c563fdc (diff)
parent99ccc25e8a4d1e51f3d7f14258e9bb6f6bab688f (diff)
downloadkolla-3653011b0a9e00e85c07bbe0b6e226a1efaa5f33.tar.gz
kolla-3653011b0a9e00e85c07bbe0b6e226a1efaa5f33.zip
Merge "Nova: fix swtpm and swtpm-tools missing from deb installs" into unmaintained/zed
-rw-r--r--docker/nova/nova-compute/Dockerfile.j22
-rw-r--r--docker/nova/nova-libvirt/Dockerfile.j21
-rw-r--r--releasenotes/notes/bug-2062572-c55c71e1045a863f.yaml5
3 files changed, 8 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'
] %}
diff --git a/releasenotes/notes/bug-2062572-c55c71e1045a863f.yaml b/releasenotes/notes/bug-2062572-c55c71e1045a863f.yaml
new file mode 100644
index 000000000..81ba6b793
--- /dev/null
+++ b/releasenotes/notes/bug-2062572-c55c71e1045a863f.yaml
@@ -0,0 +1,5 @@
+---
+fixes:
+ - |
+ Fixes a bug where swtpm and swtpm-tools deb packages are missing in 'nova-compute' and 'nova-libvirt' containers which keeps 'nova-compute' container from starting when operator enables TPM support in Nova.
+ `LP#2062572 <https://launchpad.net/bugs/2062572>`__