Merge pull request #314 from johnpbatty/devel

Fix get_flavor_id() when flavor_ram is specified
reviewable/pr18780/r1
Brian Coca 10 years ago
commit c96f44c183

@ -405,7 +405,7 @@ def _get_flavor_id(module, nova):
if (flavor.ram >= module.params['flavor_ram'] and if (flavor.ram >= module.params['flavor_ram'] and
(not module.params['flavor_include'] or module.params['flavor_include'] in flavor.name)): (not module.params['flavor_include'] or module.params['flavor_include'] in flavor.name)):
return flavor.id return flavor.id
module.fail_json(msg = "Error finding flavor with %sMB of RAM" % module.params['flavor_ram']) module.fail_json(msg = "Error finding flavor with %sMB of RAM" % module.params['flavor_ram'])
return module.params['flavor_id'] return module.params['flavor_id']

Loading…
Cancel
Save