Backport fix in PR #30712 into 2.4

https://github.com/ansible/ansible/pull/30712
pull/36258/head
PikachuEXE 8 years ago committed by Toshio Kuratomi
parent 71b1a1e982
commit 14e7432467

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

Loading…
Cancel
Save