Merge "Add ContainerDefaultPidsLimit to set default pid limits in containers.conf" into stable/victoria
This commit is contained in:
commit
8201121d70
|
@ -53,6 +53,11 @@ parameters:
|
||||||
username: pa55word
|
username: pa55word
|
||||||
'192.0.2.1:8787':
|
'192.0.2.1:8787':
|
||||||
registry_username: password
|
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:
|
SystemdDropInDependencies:
|
||||||
default: true
|
default: true
|
||||||
description: tell the tripleo_container_manage to inject
|
description: tell the tripleo_container_manage to inject
|
||||||
|
@ -85,6 +90,7 @@ outputs:
|
||||||
# default that is overwritten by the heat -> dict conversion
|
# default that is overwritten by the heat -> dict conversion
|
||||||
container_registry_logins: {}
|
container_registry_logins: {}
|
||||||
container_registry_logins_json: {get_param: ContainerImageRegistryCredentials}
|
container_registry_logins_json: {get_param: ContainerImageRegistryCredentials}
|
||||||
|
container_default_pids_limit: {get_param: ContainerDefaultPidsLimit}
|
||||||
|
|
||||||
- name: Convert logins json to dict
|
- name: Convert logins json to dict
|
||||||
set_fact:
|
set_fact:
|
||||||
|
@ -108,6 +114,7 @@ outputs:
|
||||||
tasks_from: tripleo_podman_install.yml
|
tasks_from: tripleo_podman_install.yml
|
||||||
vars:
|
vars:
|
||||||
tripleo_container_registry_insecure_registries: "{{ container_registry_insecure_registries }}"
|
tripleo_container_registry_insecure_registries: "{{ container_registry_insecure_registries }}"
|
||||||
|
tripleo_container_default_pids_limit: "{{ container_default_pids_limit }}"
|
||||||
|
|
||||||
- name: Run podman login
|
- name: Run podman login
|
||||||
include_role:
|
include_role:
|
||||||
|
|
Loading…
Reference in New Issue