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

Pass through nova region name

Browse source 
If the region name is specified in the config, we need to pass it
in to the nova client constructor. Since key_name is similarly optional,
go ahead and handle both parameters the same.
This commit is contained in:
Monty Taylor 2014-08-02 15:15:18 -07:00
parent 10a50b4a61
commit 8938222029
1 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
library/cloud/nova_compute
View file

@ -308,13 +308,14 @@ def _create_server(module, nova):
bootkwargs = { bootkwargs = {
'nics' : module.params['nics'], 'nics' : module.params['nics'],
'meta' : module.params['meta'], 'meta' : module.params['meta'],
'key_name': module.params['key_name'],
'security_groups': module.params['security_groups'].split(','), 'security_groups': module.params['security_groups'].split(','),
#userdata is unhyphenated in novaclient, but hyphenated here for consistency with the ec2 module: #userdata is unhyphenated in novaclient, but hyphenated here for consistency with the ec2 module:
'userdata': module.params['user_data'], 'userdata': module.params['user_data'],
} }
if not module.params['key_name']:
del bootkwargs['key_name'] for optional_param in ('region_name', 'key_name'):
if module.params[optional_param]:
bootkwargs[optional_param] = module.params[optional_param]
try: try:
server = nova.servers.create(*bootargs, **bootkwargs) server = nova.servers.create(*bootargs, **bootkwargs)
server = nova.servers.get(server.id) server = nova.servers.get(server.id)