Merge "Add ContainerNovaLibvirtUlimit to tweak Ulimits" into stable/queens

This commit is contained in:
Zuul 2019-07-03 15:53:52 +00:00 committed by Gerrit Code Review
commit 1c43d4985d
2 changed files with 11 additions and 0 deletions

View File

@ -12,6 +12,10 @@ parameters:
DockerNovaLibvirtConfigImage: DockerNovaLibvirtConfigImage:
description: The container image to use for the nova_libvirt config_volume description: The container image to use for the nova_libvirt config_volume
type: string type: string
ContainerNovaLibvirtUlimit:
default: ['nofile=131072', 'nproc=126960']
description: ulimit for Nova Libvirt Container
type: comma_delimited_list
ServiceData: ServiceData:
default: {} default: {}
description: Dictionary packing service data description: Dictionary packing service data
@ -281,6 +285,7 @@ outputs:
nova_virtlogd: nova_virtlogd:
start_order: 0 start_order: 0
image: {get_param: DockerNovaLibvirtImage} image: {get_param: DockerNovaLibvirtImage}
ulimit: {get_param: ContainerNovaLibvirtUlimit}
net: host net: host
pid: host pid: host
privileged: true privileged: true
@ -305,6 +310,7 @@ outputs:
nova_libvirt: nova_libvirt:
start_order: 1 start_order: 1
image: {get_param: DockerNovaLibvirtImage} image: {get_param: DockerNovaLibvirtImage}
ulimit: {get_param: ContainerNovaLibvirtUlimit}
net: host net: host
pid: host pid: host
privileged: true privileged: true

View File

@ -0,0 +1,5 @@
---
features:
- |
Add `ContainerNovaLibvirtUlimit` to configure Ulimit for containerized
Libvirt. Defaults to ``nofile=131072,nproc=126960``.