ansible-collections/community.general
1
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2025-07-24 22:00:22 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

Get rid of more wildcard imports and add boilerplate to more modules

Browse source 
This commit cleans up the following module categories:
* messaging
* inventory
* crypto
* commands
* clustering
* cloud/webfaction
* cloud/docker
* cloud/digital_ocean
This commit is contained in:
Toshio Kuratomi 2017-07-29 00:20:36 -07:00
commit 1ee08c0f06
47 changed files with 416 additions and 848 deletions
Download patch file Download diff file Expand all files Collapse all files

31
lib/ansible/modules/cloud/docker/_docker.py
View file

@ -4,22 +4,11 @@
# (c) 2014, Joshua Conner <joshua.conner@gmail.com>
# (c) 2014, Pavel Antonov <antonov@adwz.ru>
#
# This file is part of Ansible,
#
# Ansible is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
# Ansible is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with Ansible. If not, see <http://www.gnu.org/licenses/>.
# GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
from __future__ import absolute_import, division, print_function
__metaclass__ = type
######################################################################
ANSIBLE_METADATA = {'metadata_version': '1.0',
'status': ['deprecated'],
@ -524,11 +513,6 @@ EXAMPLES = '''
syslog-tag: myservice
'''
HAS_DOCKER_PY = True
DEFAULT_DOCKER_API_VERSION = None
DEFAULT_TIMEOUT_SECONDS = 60
import sys
import json
import os
import shlex
@ -543,9 +527,12 @@ try:
import docker.utils
import docker.errors
from requests.exceptions import RequestException
HAS_DOCKER_PY = True
except ImportError:
HAS_DOCKER_PY = False
DEFAULT_DOCKER_API_VERSION = None
DEFAULT_TIMEOUT_SECONDS = 60
if HAS_DOCKER_PY:
try:
from docker.errors import APIError as DockerAPIError
@ -561,6 +548,8 @@ if HAS_DOCKER_PY:
DEFAULT_DOCKER_API_VERSION = docker.client.DEFAULT_DOCKER_API_VERSION
DEFAULT_TIMEOUT_SECONDS = docker.client.DEFAULT_TIMEOUT_SECONDS
from ansible.module_utils.basic import AnsibleModule
def _human_to_bytes(number):
suffixes = ['B', 'KB', 'MB', 'GB', 'TB', 'PB']
@ -1979,8 +1968,6 @@ def main():
except RequestException as e:
module.fail_json(changed=manager.has_changed(), msg=repr(e))
# import module snippets
from ansible.module_utils.basic import *
if __name__ == '__main__':
main()