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

docker_service: parse scale parameter correctly to 2.7 (#47239)

Browse source 
* fix: Parse docker_service scale parameter to int (#45508)

* Changelog: add fragment for docker_service scale fix
This commit is contained in:
Dani Hodovic 2018-10-22 18:58:18 +03:00 committed by Toshio Kuratomi
parent 429c8f50fe
commit 28ed7f722e
2 changed files with 13 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
changelogs/fragments/45508-parse-docker-service-parameter.yaml Normal file
View file

@ -0,0 +1,2 @@
bugfixes:
- docker_service - correctly parse string values for the `scale` parameter https://github.com/ansible/ansible/pull/45508

14
lib/ansible/modules/cloud/docker/docker_service.py
View file

@ -1009,17 +1009,25 @@ class ContainerManager(DockerBaseClass):
scale=0
)
containers = service.containers(stopped=True)
if len(containers) != self.scale[service.name]:
scale = self.parse_scale(service.name)
if len(containers) != scale:
result['changed'] = True
service_res['scale'] = self.scale[service.name] - len(containers)
service_res['scale'] = scale - len(containers)
if not self.check_mode:
try:
service.scale(int(self.scale[service.name]))
service.scale(scale)
except Exception as exc:
self.client.fail("Error scaling %s - %s" % (service.name, str(exc)))
result['actions'].append(service_res)
return result
def parse_scale(self, service_name):
try:
return int(self.scale[service_name])
except ValueError:
self.client.fail("Error scaling %s - expected int, got %s",
service_name, str(type(self.scale[service_name])))
def main():
argument_spec = dict(