ansible-collections/community.general
1
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2025-07-16 09:55:26 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

docker_swarm: fix idempotency (#52976)

Browse source 
* Improve idempotency checking: only consider parameters which are part of the generated spec.

* Properly handle rotate_worker_token and rotate_manager_token.
This commit is contained in:
Felix Fontein 2019-02-26 12:46:43 +01:00 • committed by John R Barker
parent 6f585b6ee9
commit 42ae6cdb95
2 changed files with 7 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

1
changelogs/fragments/52895-docker_swarm-labels.yaml
View file

@ -1,2 +1,3 @@
bugfixes: bugfixes:
- "docker_swarm - do not crash with older docker daemons (https://github.com/ansible/ansible/issues/51175)." - "docker_swarm - do not crash with older docker daemons (https://github.com/ansible/ansible/issues/51175)."
- "docker_swarm - improve idempotency checking; ``rotate_worker_token`` and ``rotate_manager_token`` are now also used when all other parameters have not changed."

7
lib/ansible/modules/cloud/docker/docker_swarm.py
View file

@ -349,12 +349,17 @@ class TaskParameters(DockerBaseClass):
def compare_to_active(self, other, differences): def compare_to_active(self, other, differences):
for k in self.__dict__: for k in self.__dict__:
if k in ('advertise_addr', 'listen_addr', 'rotate_worker_token', 'rotate_manager_token', 'spec'): if k in ('advertise_addr', 'listen_addr', 'force_new_cluster', 'remote_addrs',
'join_token', 'force', 'rotate_worker_token', 'rotate_manager_token', 'spec'):
continue continue
if self.__dict__[k] is None: if self.__dict__[k] is None:
continue continue
if self.__dict__[k] != other.__dict__[k]: if self.__dict__[k] != other.__dict__[k]:
differences.add(k, parameter=self.__dict__[k], active=other.__dict__[k]) differences.add(k, parameter=self.__dict__[k], active=other.__dict__[k])
if self.rotate_worker_token:
differences.add('rotate_worker_token', parameter=True, active=False)
if self.rotate_manager_token:
differences.add('rotate_manager_token', parameter=True, active=False)
return differences return differences