From dec0ceeec881733c206b1fa65336c8b5cad93afd Mon Sep 17 00:00:00 2001 From: tpourcelot Date: Sat, 2 Aug 2025 17:18:56 +0200 Subject: [PATCH] Apply suggestions from code review Co-authored-by: Felix Fontein --- changelogs/fragments/1108-replicated-job-support.yml | 2 +- plugins/modules/docker_swarm_service.py | 4 ++-- .../targets/docker_swarm_service/tasks/tests/options.yml | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/changelogs/fragments/1108-replicated-job-support.yml b/changelogs/fragments/1108-replicated-job-support.yml index 4242ff32..7642753f 100644 --- a/changelogs/fragments/1108-replicated-job-support.yml +++ b/changelogs/fragments/1108-replicated-job-support.yml @@ -1,2 +1,2 @@ minor_changes: - - docker_swarm_service - Add support for ``replicated-job`` mode for Swarm services (https://github.com/ansible-collections/community.docker/issues/626) + - docker_swarm_service - add support for ``replicated-job`` mode for Swarm services (https://github.com/ansible-collections/community.docker/issues/626, https://github.com/ansible-collections/community.docker/pull/1108). diff --git a/plugins/modules/docker_swarm_service.py b/plugins/modules/docker_swarm_service.py index e303b53f..8be5b243 100644 --- a/plugins/modules/docker_swarm_service.py +++ b/plugins/modules/docker_swarm_service.py @@ -237,7 +237,7 @@ options: - Service replication mode. - Service will be removed and recreated when changed. - Corresponds to the C(--mode) option of C(docker service create). - - The value V(replicated-job) was added in community.docker 4.7.0 and requires API version >= 1.41. + - The value V(replicated-job) was added in community.docker 4.7.0, and requires API version >= 1.41 and Docker SDK for Python >= 6.0.0. type: str default: replicated choices: @@ -2758,7 +2758,7 @@ def main(): ) is not None, usage_msg='set rollback_config.order' ), - mode=dict( + mode_replicated_job=dict( docker_py_version='6.0.0', docker_api_version='1.41', detect_usage=lambda c: c.module.params.get('mode') == 'replicated-job', diff --git a/tests/integration/targets/docker_swarm_service/tasks/tests/options.yml b/tests/integration/targets/docker_swarm_service/tasks/tests/options.yml index 21390afc..d66eda36 100644 --- a/tests/integration/targets/docker_swarm_service/tasks/tests/options.yml +++ b/tests/integration/targets/docker_swarm_service/tasks/tests/options.yml @@ -1348,7 +1348,7 @@ - assert: that: - mode_4 is changed - - mode_5 is not changed + - mode_5 is not changed and mode_5 is not failed - mode_6 is changed when: docker_api_version is version('1.41', '>=') and docker_py_version is version('6.0.0', '>=')