cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge pull request #1904 from Shrews/os_flavor_facts

Browse source 
Add shade version check to os_flavor_facts
This commit is contained in:
Monty Taylor 2016-03-24 05:51:51 -07:00
commit 7e541b6408
1 changed files with 6 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
cloud/openstack/os_flavor_facts.py
View file

@ -23,6 +23,9 @@ try:
except ImportError: except ImportError:
HAS_SHADE = False HAS_SHADE = False
from distutils.version import StrictVersion
DOCUMENTATION = ''' DOCUMENTATION = '''
--- ---
module: os_flavor_facts module: os_flavor_facts
@ -200,6 +203,9 @@ def main():
if ram: if ram:
filters['ram'] = ram filters['ram'] = ram
if filters: if filters:
# Range search added in 1.5.0
if StrictVersion(shade.__version__) < StrictVersion('1.5.0'):
module.fail_json(msg="Shade >= 1.5.0 needed for this functionality")
flavors = cloud.range_search(flavors, filters) flavors = cloud.range_search(flavors, filters)
if limit is not None: if limit is not None: