mirror of
https://github.com/ansible-collections/community.general.git
synced 2025-10-09 18:04:02 -07:00
Several cleanups to many modules:
* Fix docs to specify when python2.6+ is required (due to a library dep). This helps us know when it is okay to use python2.6+ syntax in the file. * remove BabyJson returns. See #1211 This commit fixes all but the openstack modules. * Use if __name__ == '__main__' to only run the main part of the module if the module is run as a program. This allows for the potential to unittest the code later.
This commit is contained in:
parent
0567404c03
commit
5336217649
17 changed files with 186 additions and 114 deletions
|
@ -88,7 +88,10 @@ options:
|
|||
description:
|
||||
- how long before wait gives up, in seconds
|
||||
default: 300
|
||||
requirements: [ "linode-python", "pycurl" ]
|
||||
requirements:
|
||||
- "python >= 2.6"
|
||||
- "linode-python"
|
||||
- "pycurl"
|
||||
author: Vincent Viallet
|
||||
notes:
|
||||
- LINODE_API_KEY env variable can be used instead
|
||||
|
@ -151,22 +154,21 @@ EXAMPLES = '''
|
|||
state: restarted
|
||||
'''
|
||||
|
||||
import sys
|
||||
import time
|
||||
import os
|
||||
|
||||
try:
|
||||
import pycurl
|
||||
HAS_PYCURL = True
|
||||
except ImportError:
|
||||
print("failed=True msg='pycurl required for this module'")
|
||||
sys.exit(1)
|
||||
HAS_PYCURL = False
|
||||
|
||||
|
||||
try:
|
||||
from linode import api as linode_api
|
||||
HAS_LINODE = True
|
||||
except ImportError:
|
||||
print("failed=True msg='linode-python required for this module'")
|
||||
sys.exit(1)
|
||||
HAS_LINODE = False
|
||||
|
||||
|
||||
def randompass():
|
||||
|
@ -456,6 +458,11 @@ def main():
|
|||
)
|
||||
)
|
||||
|
||||
if not HAS_PYCURL:
|
||||
module.fail_json(msg='pycurl required for this module')
|
||||
if not HAS_LINODE:
|
||||
module.fail_json(msg='linode-python required for this module')
|
||||
|
||||
state = module.params.get('state')
|
||||
api_key = module.params.get('api_key')
|
||||
name = module.params.get('name')
|
||||
|
@ -490,4 +497,5 @@ def main():
|
|||
# import module snippets
|
||||
from ansible.module_utils.basic import *
|
||||
|
||||
main()
|
||||
if __name__ == '__main__':
|
||||
main()
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue