mirror of
https://github.com/saltstack/salt.git
synced 2025-04-17 10:10:20 +00:00
Merge pull request #38102 from rallytime/fix-38091
Add False + msg tuple return if requests is missing for zenoss module
This commit is contained in:
commit
d3d98fd4eb
1 changed files with 8 additions and 1 deletions
|
@ -4,6 +4,8 @@ Module for working with the Zenoss API
|
|||
|
||||
.. versionadded:: 2016.3.0
|
||||
|
||||
:depends: requests
|
||||
|
||||
:configuration: This module requires a 'zenoss' entry in the master/minion config.
|
||||
|
||||
For example:
|
||||
|
@ -36,13 +38,18 @@ urllib3_logger.setLevel(logging.WARNING)
|
|||
|
||||
log = logging.getLogger(__name__)
|
||||
|
||||
__virtualname__ = 'zenoss'
|
||||
|
||||
|
||||
def __virtual__():
|
||||
'''
|
||||
Only load if requests is installed
|
||||
'''
|
||||
if HAS_LIBS:
|
||||
return 'zenoss'
|
||||
return __virtualname__
|
||||
else:
|
||||
return False, 'The \'{0}\' module could not be loaded: ' \
|
||||
'\'requests\' is not installed.'.format(__virtualname__)
|
||||
|
||||
ROUTERS = {'MessagingRouter': 'messaging',
|
||||
'EventsRouter': 'evconsole',
|
||||
|
|
Loading…
Add table
Reference in a new issue