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

docker_swarm: fix ca_force_rotate idempotency (#53039)

Browse source 
* Fix ca_force_rotate idempotency.

* Add changelog.
This commit is contained in:
Felix Fontein 2019-02-27 10:11:45 +01:00 committed by John R Barker
parent 8563c2616b
commit dec97381bc
2 changed files with 4 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
changelogs/fragments/53039-docker_swarm-ca_force_rotate.yml Normal file
View file

@ -0,0 +1,2 @@
bugfixes:
- "docker_swarm - fixes idempotency for the ``ca_force_rotate`` option."

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

@ -297,6 +297,8 @@ class TaskParameters(DockerBaseClass):
ca_config = spec.get('CAConfig') or dict() ca_config = spec.get('CAConfig') or dict()
if self.node_cert_expiry is None: if self.node_cert_expiry is None:
self.node_cert_expiry = ca_config.get('NodeCertExpiry') self.node_cert_expiry = ca_config.get('NodeCertExpiry')
if self.ca_force_rotate is None:
self.ca_force_rotate = ca_config.get('ForceRotate')
dispatcher = spec.get('Dispatcher') or dict() dispatcher = spec.get('Dispatcher') or dict()
if self.dispatcher_heartbeat_period is None: if self.dispatcher_heartbeat_period is None: