a-c-m
/
community.general
mirror of https://github.com/ansible-collections/community.general.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[fix] issue #29886 - it misses oom_killer in host_config_params (#30712) 

so it was never passed to docker API.
pull/4420/head
Sebastien Boyron 2017-09-26 02:42:02 +02:00 committed by ansibot
parent 4647713be9
commit cb5f2c7ac3
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/ansible/modules/cloud/docker/docker_container.py
View File

@ -855,7 +855,7 @@ class TaskParameters(DockerBaseClass):
mem_limit='memory', mem_limit='memory',
mem_reservation='mem_reservation', mem_reservation='mem_reservation',
memswap_limit='memory_swap', memswap_limit='memory_swap',
kernel_memory='kernel_memory' kernel_memory='kernel_memory',
) )
result = dict() result = dict()
for key, value in update_parameters.items(): for key, value in update_parameters.items():
@ -966,6 +966,7 @@ class TaskParameters(DockerBaseClass):
memswap_limit='memory_swap', memswap_limit='memory_swap',
mem_swappiness='memory_swappiness', mem_swappiness='memory_swappiness',
oom_score_adj='oom_score_adj', oom_score_adj='oom_score_adj',
oom_kill_disable='oom_killer',
shm_size='shm_size', shm_size='shm_size',
group_add='groups', group_add='groups',
devices='devices', devices='devices',
@ -1437,6 +1438,7 @@ class Container(DockerBaseClass):
memory_reservation=host_config.get('MemoryReservation'), memory_reservation=host_config.get('MemoryReservation'),
memory_swap=host_config.get('MemorySwap'), memory_swap=host_config.get('MemorySwap'),
oom_score_adj=host_config.get('OomScoreAdj'), oom_score_adj=host_config.get('OomScoreAdj'),
oom_killer=host_config.get('OomKillDisable'),
) )
differences = [] differences = []