Merge "Nova: fix swtpm and swtpm-tools missing from deb installs"

Author: Zuul

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'

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'
     ] %}
 

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>`__