Merge "Add ContainerDefaultPidsLimit to set default pid limits in containers.conf" into stable/ussuri
This commit is contained in:
commit
18764f0577
|
@ -53,6 +53,11 @@ parameters:
|
|||
username: pa55word
|
||||
'192.0.2.1:8787':
|
||||
registry_username: password
|
||||
ContainerDefaultPidsLimit:
|
||||
type: number
|
||||
default: 4096
|
||||
description: Setting to configure the default pids_limit in /etc/container/container.conf.
|
||||
This is supported starting with podman 2.0.x
|
||||
SystemdDropInDependencies:
|
||||
default: true
|
||||
description: tell the container manager (e.g. paunch) to inject
|
||||
|
@ -85,6 +90,7 @@ outputs:
|
|||
# default that is overwritten by the heat -> dict conversion
|
||||
container_registry_logins: {}
|
||||
container_registry_logins_json: {get_param: ContainerImageRegistryCredentials}
|
||||
container_default_pids_limit: {get_param: ContainerDefaultPidsLimit}
|
||||
|
||||
- name: Convert logins json to dict
|
||||
set_fact:
|
||||
|
@ -108,6 +114,7 @@ outputs:
|
|||
tasks_from: tripleo_podman_install.yml
|
||||
vars:
|
||||
tripleo_container_registry_insecure_registries: "{{ container_registry_insecure_registries }}"
|
||||
tripleo_container_default_pids_limit: "{{ container_default_pids_limit }}"
|
||||
|
||||
- name: Run podman login
|
||||
include_role:
|
||||
|
|
Loading…
Reference in New Issue