wbrawner/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

docker_swarm_service: Don’t add difference when update_order is None (#50655)

Browse source 
* Don’t add difference when update_order is None

* Add changelog fragment
This commit is contained in:
Hannes Ljungberg 2019-01-14 11:58:05 +01:00 committed by René Moser
parent fc0f20a35e
commit cde292cc43
2 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
changelogs/fragments/50655-docker_swarm_service-update_order-idempotency.yml Normal file
View file

@ -0,0 +1,2 @@
bugfixes:
- "docker_swarm_service - fixing falsely reporting ``update_order`` as changed when option is not used."

2
lib/ansible/modules/cloud/docker/docker_swarm_service.py
View file

@ -719,7 +719,7 @@ class DockerService(DockerBaseClass):
differences.add('update_monitor', parameter=self.update_monitor, active=os.update_monitor)
if self.update_max_failure_ratio != os.update_max_failure_ratio:
differences.add('update_max_failure_ratio', parameter=self.update_max_failure_ratio, active=os.update_max_failure_ratio)
if self.update_order != os.update_order:
if self.update_order is not None and self.update_order != os.update_order:
differences.add('update_order', parameter=self.update_order, active=os.update_order)
if self.image != os.image.split('@')[0]:
differences.add('image', parameter=self.image, active=os.image.split('@')[0])