Merge pull request #361 from stackhpc/upstream/2023.1-2024-11-04

priteau · web-flow · commit e11a32560641 · 2024-11-04T09:34:44.000+01:00
Synchronise 2023.1 with upstream
diff --git a/docker/nova/nova-compute/Dockerfile.j2 b/docker/nova/nova-compute/Dockerfile.j2
@@ -75,6 +75,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
         'swtpm-tools',
         'sysfsutils',
         'targetcli-fb',
+        'tpm2-tools',
         'xfsprogs'
     ] %}
 
diff --git a/docker/nova/nova-libvirt/Dockerfile.j2 b/docker/nova/nova-libvirt/Dockerfile.j2
@@ -57,6 +57,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
         'sasl2-bin',
         'swtpm',
         'swtpm-tools',
+        'tpm2-tools',
         'trousers'
     ] %}
 
diff --git a/releasenotes/notes/fix_nova_tpm_user-98f56190196a00d2.yaml b/releasenotes/notes/fix_nova_tpm_user-98f56190196a00d2.yaml
@@ -0,0 +1,6 @@
+---
+fixes:
+  - |
+    Fixes missing tpm user for nova-compute and nova-libvirt containers
+    by adding tpm2-tools package to Ubuntu/Debian nova containers.
+    `LP#2067050 <https://bugs.launchpad.net/kolla/+bug/2067050>`__
