Merge pull request #3874 from mscherer/relax_nova_compute_argument

image_id is not required to delete a vm from openstack
reviewable/pr18780/r1
Michael DeHaan 11 years ago
commit d513647165

@ -213,7 +213,7 @@ def main():
auth_url = dict(default='http://127.0.0.1:35357/v2.0/'), auth_url = dict(default='http://127.0.0.1:35357/v2.0/'),
region_name = dict(default=None), region_name = dict(default=None),
name = dict(required=True), name = dict(required=True),
image_id = dict(required=True), image_id = dict(default=None),
flavor_id = dict(default=1), flavor_id = dict(default=1),
key_name = dict(default=None), key_name = dict(default=None),
security_groups = dict(default='default'), security_groups = dict(default='default'),
@ -234,8 +234,11 @@ def main():
except Exception as e: except Exception as e:
module.fail_json( msg = "Error in authenticating to nova: %s" % e.message) module.fail_json( msg = "Error in authenticating to nova: %s" % e.message)
if module.params['state'] == 'present': if module.params['state'] == 'present':
_get_server_state(module, nova) if not module.params['image_id']:
_create_server(module, nova) module.fail_json( msg = "Parameter 'image_id' is required if state == 'present'")
else:
_get_server_state(module, nova)
_create_server(module, nova)
if module.params['state'] == 'absent': if module.params['state'] == 'absent':
_get_server_state(module, nova) _get_server_state(module, nova)
_delete_server(module, nova) _delete_server(module, nova)

Loading…
Cancel
Save