diff --git a/changelogs/fragments/52420-docker_swarm_service-remove-update-defaults.yml b/changelogs/fragments/52420-docker_swarm_service-remove-update-defaults.yml new file mode 100644 index 0000000000..f3416a8518 --- /dev/null +++ b/changelogs/fragments/52420-docker_swarm_service-remove-update-defaults.yml @@ -0,0 +1,3 @@ +bugfixes: + - "docker_swarm_service - Don't set ``1`` as default for ``update_parallelism``." + - "docker_swarm_service - Don't set ``10`` as default for ``update_delay``." diff --git a/docs/docsite/rst/porting_guides/porting_guide_2.8.rst b/docs/docsite/rst/porting_guides/porting_guide_2.8.rst index 9a265b0693..4afe4d31b8 100644 --- a/docs/docsite/rst/porting_guides/porting_guide_2.8.rst +++ b/docs/docsite/rst/porting_guides/porting_guide_2.8.rst @@ -185,7 +185,10 @@ Noteworthy module changes * The ``docker_service`` module was renamed to :ref:`docker_compose `. -* The ``docker_swarm_service`` module no longer sets a default for the ``user`` option. Before, the default was ``root``. +* The ``docker_swarm_service`` module no longer sets a defaults for the following options: + * ``user``. Before, the default was ``root``. + * ``update_delay``. Before, the default was ``10``. + * ``update_parallelism``. Before, the default was ``1``. * ``vmware_vm_facts`` used to return dict of dict with virtual machine's facts. Ansible 2.8 and onwards will return list of dict with virtual machine's facts. Please see module ``vmware_vm_facts`` documentation for example. diff --git a/lib/ansible/modules/cloud/docker/docker_swarm_service.py b/lib/ansible/modules/cloud/docker/docker_swarm_service.py index c8d3368212..3b2465d4c6 100644 --- a/lib/ansible/modules/cloud/docker/docker_swarm_service.py +++ b/lib/ansible/modules/cloud/docker/docker_swarm_service.py @@ -403,16 +403,16 @@ options: - Corresponds to the C(--restart-window) option of C(docker service create). update_delay: type: int - default: 10 description: - Rolling update delay in nanoseconds. - Corresponds to the C(--update-delay) option of C(docker service create). + - Before Ansible 2.8, the default value for this option was C(10). update_parallelism: type: int - default: 1 description: - Rolling update parallelism. - Corresponds to the C(--update-parallelism) option of C(docker service create). + - Before Ansible 2.8, the default value for this option was C(1). update_failure_action: type: str description: @@ -1711,8 +1711,8 @@ def main(): restart_policy_delay=dict(type='int'), restart_policy_attempts=dict(type='int'), restart_policy_window=dict(type='int'), - update_delay=dict(default=10, type='int'), - update_parallelism=dict(default=1, type='int'), + update_delay=dict(type='int'), + update_parallelism=dict(type='int'), update_failure_action=dict(choices=['continue', 'pause']), update_monitor=dict(type='int'), update_max_failure_ratio=dict(type='float'), diff --git a/test/integration/targets/docker_swarm_service/vars/main.yml b/test/integration/targets/docker_swarm_service/vars/main.yml index 8c92675b9e..a96a76e43f 100644 --- a/test/integration/targets/docker_swarm_service/vars/main.yml +++ b/test/integration/targets/docker_swarm_service/vars/main.yml @@ -38,10 +38,10 @@ service_expected_output: restart_policy_delay: null restart_policy_window: null tty: null - update_delay: 10 + update_delay: null update_failure_action: null update_max_failure_ratio: null update_monitor: null update_order: null - update_parallelism: 1 + update_parallelism: null working_dir: null