1
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2024-09-14 20:13:21 +02:00

Added userns support on docker_container module Fixes #20648 (#22195)

* added userns support on docker_container module

* Fixes #20648 - changed 'version_added' of userns_mode to 2.3 from 2.2

* version_added 2.5
This commit is contained in:
Harris Dimitriou 2017-11-28 18:54:19 +02:00 committed by John R Barker
parent 6749a39dbe
commit 9e9f2b9ad5

View file

@ -264,6 +264,12 @@ options:
- none - none
default: null default: null
required: false required: false
userns_mode:
description:
- User namespace to use
default: null
required: false
version_added: "2.5"
networks: networks:
description: description:
- List of networks the container belongs to. - List of networks the container belongs to.
@ -751,6 +757,7 @@ class TaskParameters(DockerBaseClass):
self.memory_swappiness = None self.memory_swappiness = None
self.name = None self.name = None
self.network_mode = None self.network_mode = None
self.userns_mode = None
self.networks = None self.networks = None
self.oom_killer = None self.oom_killer = None
self.oom_score_adj = None self.oom_score_adj = None
@ -954,6 +961,7 @@ class TaskParameters(DockerBaseClass):
binds='volume_binds', binds='volume_binds',
volumes_from='volumes_from', volumes_from='volumes_from',
network_mode='network_mode', network_mode='network_mode',
userns_mode='userns_mode',
cap_add='capabilities', cap_add='capabilities',
extra_hosts='etc_hosts', extra_hosts='etc_hosts',
read_only='read_only', read_only='read_only',
@ -1312,6 +1320,7 @@ class Container(DockerBaseClass):
mac_address=network.get('MacAddress'), mac_address=network.get('MacAddress'),
memory_swappiness=host_config.get('MemorySwappiness'), memory_swappiness=host_config.get('MemorySwappiness'),
network_mode=host_config.get('NetworkMode'), network_mode=host_config.get('NetworkMode'),
userns_mode=host_config.get('UsernsMode'),
oom_killer=host_config.get('OomKillDisable'), oom_killer=host_config.get('OomKillDisable'),
oom_score_adj=host_config.get('OomScoreAdj'), oom_score_adj=host_config.get('OomScoreAdj'),
pid_mode=host_config.get('PidMode'), pid_mode=host_config.get('PidMode'),
@ -2080,6 +2089,7 @@ def main():
memory_swappiness=dict(type='int'), memory_swappiness=dict(type='int'),
name=dict(type='str', required=True), name=dict(type='str', required=True),
network_mode=dict(type='str'), network_mode=dict(type='str'),
userns_mode=dict(type='str'),
networks=dict(type='list'), networks=dict(type='list'),
oom_killer=dict(type='bool'), oom_killer=dict(type='bool'),
oom_score_adj=dict(type='int'), oom_score_adj=dict(type='int'),