valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 09:23:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Try/catch junos import

Browse Source
This commit is contained in:
Mike Place 2016-03-25 16:23:37 -06:00
parent b95c5feda7
commit db6702f942
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
salt/grains/junos.py
View File

@ -6,7 +6,11 @@ via salt-proxy-minion.Thus, some grains make sense to get them
from the minion (PYTHONPATH), but others don't (ip_interfaces)
'''
from __future__ import absolute_import
from jnpr.junos.device import Device
HAS_LIBS = True
try:
from jnpr.junos.device import Device
except ImportError:
HAS_LIBS = False
import logging
__proxyenabled__ = ['junos']
@ -15,7 +19,7 @@ log = logging.getLogger(__name__)
def __virtual__():
if 'proxy' not in __opts__:
if 'proxy' not in __opts__ or not HAS_LIBS:
return False
else:
return __virtualname__