internet/community.general
3
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2026-05-07 05:42:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Promulgate house's fix for docker_volume to docker_secret

Browse Source 
* Revert change to docker_common as it's not as good as the try: except fix
* limit docker_volume fix to ImportErrors
* fix docker_secret i nthe same way
* Remove docker_secret from import tests
This commit is contained in:
Toshio Kuratomi
2017-07-19 12:52:49 -07:00
parent ef8c9798d3
commit df15583ad0
4 changed files with 12 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
lib/ansible/modules/cloud/docker/docker_volume.py
View File

@@ -106,15 +106,15 @@ facts:
sample: {}
'''
from ansible.module_utils.six import iteritems, text_type
from ansible.module_utils.docker_common import DockerBaseClass, AnsibleDockerClient
try:
from docker.errors import APIError
except:
except ImportError:
# missing docker-py handled in ansible.module_utils.docker
pass
from ansible.module_utils.six import iteritems, text_type
from ansible.module_utils.docker_common import DockerBaseClass, AnsibleDockerClient
class TaskParameters(DockerBaseClass):
def __init__(self, client):