Guest User

Untitled

a guest
May 24th, 2018
118
0
Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
text 1.84 KB | None | 0 0
  1. --- lib/ansible/modules/cloud/docker/docker_swarm_service.py 2018-05-18 17:00:09.828885095 -0400
  2. +++ ../throtle-ansible/library/docker_swarm_service.py 2018-05-18 15:50:15.225333366 -0400
  3. @@ -358,19 +358,22 @@
  4. state: absent
  5. '''
  6.  
  7. -from ansible.module_utils.docker_common import HAS_DOCKER_PY_2
  8. from ansible.module_utils.docker_common import DockerBaseClass
  9. from ansible.module_utils.docker_common import AnsibleDockerClient
  10. from ansible.module_utils.basic import human_to_bytes
  11. from ansible.module_utils._text import to_text
  12.  
  13. -from distutils.version import LooseVersion
  14. -
  15. try:
  16. + from distutils.version import LooseVersion
  17. from docker import utils
  18. from docker import types
  19. - from docker.utils.types import Ulimit
  20. - from ansible.module_utils.docker_common import docker_version
  21. + from docker import __version__ as docker_version
  22. + if LooseVersion(docker_version) >= LooseVersion('2.0.0'):
  23. + from docker.types import Ulimit, LogConfig
  24. + HAS_DOCKER_PY_2 = True
  25. + else:
  26. + from docker.utils.types import Ulimit, LogConfig
  27. +
  28. except:
  29. # missing docker-py handled in ansible.module_utils.docker
  30. pass
  31. @@ -741,7 +744,7 @@
  32. old_service.service_id,
  33. old_service.service_version,
  34. name=name,
  35. - endpoint_config=endpoint_spec,
  36. + endpoint_spec=endpoint_spec,
  37. networks=networks,
  38. mode=mode,
  39. task_template=task_template,
  40. @@ -751,7 +754,7 @@
  41. task_template, networks, endpoint_spec, mode, labels = service.generate_docker_py_service_description(name, self.get_networks_names_ids())
  42. self.client.create_service(
  43. name=name,
  44. - endpoint_config=endpoint_spec,
  45. + endpoint_spec=endpoint_spec,
  46. mode=mode,
  47. networks=networks,
  48. task_template=task_template,
Add Comment
Please, Sign In to add comment