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

Merge pull request #37440 from rallytime/bp-31207

Browse Source 
Back-port #31207 to 2016.3
This commit is contained in:
Mike Place 2016-11-04 17:09:33 +13:00 committed by GitHub
commit 9aa7073f70
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
salt/modules/boto_route53.py
View File

@ -60,6 +60,7 @@ from salt.exceptions import SaltInvocationError
log = logging.getLogger(__name__)
# Import third party libs
REQUIRED_BOTO_VERSION = '2.35.0'
try:
#pylint: disable=unused-import
import boto
@ -67,10 +68,7 @@ try:
from boto.route53.exception import DNSServerError
#pylint: enable=unused-import
# create_zone params were changed in boto 2.35+
required_boto_version = '2.35.0'
if _LooseVersion(boto.__version__) < _LooseVersion(required_boto_version):
msg = 'boto_route53 requires at least boto {0}.'.format(required_boto_version)
log.error(msg)
if _LooseVersion(boto.__version__) < _LooseVersion(REQUIRED_BOTO_VERSION):
raise ImportError()
logging.getLogger('boto').setLevel(logging.CRITICAL)
HAS_BOTO = True
@ -83,7 +81,9 @@ def __virtual__():
Only load if boto libraries exist.
'''
if not HAS_BOTO:
return (False, 'The boto_route53 module could not be loaded: boto libraries not found')
msg = ('A boto library with version at least {0} was not '
'found').format(REQUIRED_BOTO_VERSION)
return (False, msg)
return True