saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-17 10:10:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge pull request #29196 from s0undt3ch/2015.8

Browse source 
We need novaclient imported to compare versions
This commit is contained in:
Mike Place 2015-11-25 10:16:27 -07:00
commit 6a12197e13
1 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
salt/utils/openstack/nova.py
View file

@ -41,11 +41,12 @@ NOVACLIENT_MINVER = '2.6.1'
def check_nova():
novaclient_ver = LooseVersion(novaclient.__version__)
min_ver = LooseVersion(NOVACLIENT_MINVER)
if novaclient_ver >= min_ver:
return HAS_NOVA
log.debug('Newer novaclient version required. Minimum: 2.6.1')
if HAS_NOVA:
novaclient_ver = LooseVersion(novaclient.__version__)
min_ver = LooseVersion(NOVACLIENT_MINVER)
if novaclient_ver >= min_ver:
return HAS_NOVA
log.debug('Newer novaclient version required. Minimum: 2.6.1')
return False