diff --git a/deployment/nova/nova-libvirt-container-puppet.yaml b/deployment/nova/nova-libvirt-container-puppet.yaml
index 1758cbb405..11e9e1da49 100644
--- a/deployment/nova/nova-libvirt-container-puppet.yaml
+++ b/deployment/nova/nova-libvirt-container-puppet.yaml
@@ -16,6 +16,11 @@ parameters:
     default: ['nofile=131072', 'nproc=126960']
     description: ulimit for Nova Libvirt Container
     type: comma_delimited_list
+  ContainerNovaLibvirtPidsLimit:
+    default: 65536
+    description: Tune nova_libvirt container PID limit (set to 0 for unlimited)
+                 (defaults to 65536)
+    type: number
   ServiceData:
     default: {}
     description: Dictionary packing service data
@@ -693,6 +698,7 @@ outputs:
             ulimit: {get_param: ContainerNovaLibvirtUlimit}
             net: host
             pid: host
+            pids_limit: {get_param: ContainerNovaLibvirtPidsLimit}
             privileged: true
             security_opt: label=disable
             restart: always
diff --git a/releasenotes/notes/ContainerNovaLibvirtPidsLimit-cdad2166b6c0195f.yaml b/releasenotes/notes/ContainerNovaLibvirtPidsLimit-cdad2166b6c0195f.yaml
new file mode 100644
index 0000000000..e4416a6d96
--- /dev/null
+++ b/releasenotes/notes/ContainerNovaLibvirtPidsLimit-cdad2166b6c0195f.yaml
@@ -0,0 +1,6 @@
+---
+features:
+  - |
+    Adds a new ContainerNovaLibvirtPidsLimit parameter in order to set the
+    PIDs limit for nova_libvirt container. Defaults to 65536, set to 0 for
+    unlimited.