ansible-collections/community.general
1
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2025-04-26 12:21:26 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

docker_swarm_service: Fix crash when using configs parameter (#50606)

Browse source 
* Fix crash when using configs parameter

* Don’t add difference for configs set to None

* Add changelog fragment

* Revert "Add changelog fragment"

This reverts commit 8df497e3881d976e7417d2662a167694fbc33147.

* Enable config tests

* Pass empty list of configs to docker

* Properly clean up after all tests
This commit is contained in:
Hannes Ljungberg 2019-01-21 21:29:00 +01:00 • committed by ansibot
parent 393bf5e4b1
commit 9c44dc371b
2 changed files with 84 additions and 56 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -552,7 +552,7 @@ class DockerService(DockerBaseClass):
self.mode = "replicated"
self.user = "root"
self.mounts = []
self.configs = None
self.configs = []
self.secrets = []
self.constraints = []
self.networks = []
@ -688,7 +688,7 @@ class DockerService(DockerBaseClass):
s.mounts.append(service_m)
s.configs = None
if ap['configs']:
if ap['configs'] is not None:
s.configs = []
for param_m in ap['configs']:
service_c = {}
@ -729,7 +729,7 @@ class DockerService(DockerBaseClass):
differences.add('mode', parameter=self.mode, active=os.mode)
if self.mounts != os.mounts:
differences.add('mounts', parameter=self.mounts, active=os.mounts)
if self.configs != os.configs:
if self.configs is not None and self.configs != os.configs:
differences.add('configs', parameter=self.configs, active=os.configs)
if self.secrets != os.secrets:
differences.add('secrets', parameter=self.secrets, active=os.secrets)