oom_killer and oom_score_adj are available since docker-py 1.8.0. (#56012)

* oom_killer and oom_score_adj are available since docker-py 1.8.0.

* Add changelog.

(cherry picked from commit f692261ea0)

changelogs/fragments/56012-docker_container-oom-version.yml

@@ -0,0 +1,2 @@
+bugfixes:
+- "docker_container - ``oom_killer`` and ``oom_score_adj`` options are available since docker-py 1.8.0, not 2.0.0 as assumed by the version check."

lib/ansible/modules/cloud/docker/docker_container.py

@@ -2276,8 +2276,7 @@ class AnsibleDockerClientContainer(AnsibleDockerClient):
             dns_opts=dict(docker_api_version='1.21', docker_py_version='1.10.0'),
             ipc_mode=dict(docker_api_version='1.25'),
             mac_address=dict(docker_api_version='1.25'),
-            oom_killer=dict(docker_py_version='2.0.0'),
-            oom_score_adj=dict(docker_api_version='1.22', docker_py_version='2.0.0'),
+            oom_score_adj=dict(docker_api_version='1.22'),
             shm_size=dict(docker_api_version='1.22'),
             stop_signal=dict(docker_api_version='1.21'),
             tmpfs=dict(docker_api_version='1.22', docker_py_version='1.8.0'),

test/integration/targets/docker_container/tasks/tests/options.yml

@@ -2201,7 +2201,6 @@ avoid such warnings, please quote the value.' in log_options_2.warnings"
     oom_killer: yes
     state: started
   register: oom_killer_1
-  ignore_errors: yes
 
 - name: oom_killer (idempotency)
   docker_container:
@@ -2211,7 +2210,6 @@ avoid such warnings, please quote the value.' in log_options_2.warnings"
     oom_killer: yes
     state: started
   register: oom_killer_2
-  ignore_errors: yes
 
 - name: oom_killer (change)
   docker_container:
@@ -2222,7 +2220,6 @@ avoid such warnings, please quote the value.' in log_options_2.warnings"
     state: started
     stop_timeout: 1
   register: oom_killer_3
-  ignore_errors: yes
 
 - name: cleanup
   docker_container:
@@ -2235,12 +2232,6 @@ avoid such warnings, please quote the value.' in log_options_2.warnings"
     - oom_killer_1 is changed
     - oom_killer_2 is not changed
     - oom_killer_3 is changed
-  when: docker_py_version is version('2.0.0', '>=')
-- assert:
-    that:
-    - oom_killer_1 is failed
-    - "('version is ' ~ docker_py_version ~'. Minimum version required is 2.0.0') in oom_killer_1.msg"
-  when: docker_py_version is version('2.0.0', '<')
 
 ####################################################################
 ## oom_score_adj ###################################################
@@ -2254,7 +2245,6 @@ avoid such warnings, please quote the value.' in log_options_2.warnings"
     oom_score_adj: 5
     state: started
   register: oom_score_adj_1
-  ignore_errors: yes
 
 - name: oom_score_adj (idempotency)
   docker_container:
@@ -2264,7 +2254,6 @@ avoid such warnings, please quote the value.' in log_options_2.warnings"
     oom_score_adj: 5
     state: started
   register: oom_score_adj_2
-  ignore_errors: yes
 
 - name: oom_score_adj (change)
   docker_container:
@@ -2275,7 +2264,6 @@ avoid such warnings, please quote the value.' in log_options_2.warnings"
     state: started
     stop_timeout: 1
   register: oom_score_adj_3
-  ignore_errors: yes
 
 - name: cleanup
   docker_container:
@@ -2288,12 +2276,6 @@ avoid such warnings, please quote the value.' in log_options_2.warnings"
     - oom_score_adj_1 is changed
     - oom_score_adj_2 is not changed
     - oom_score_adj_3 is changed
-  when: docker_py_version is version('2.0.0', '>=')
-- assert:
-    that:
-    - oom_score_adj_1 is failed
-    - "('version is ' ~ docker_py_version ~'. Minimum version required is 2.0.0') in oom_score_adj_1.msg"
-  when: docker_py_version is version('2.0.0', '<')
 
 ####################################################################
 ## output_logs #####################################################