valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 01:18:58 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Don't force a name for compute endpoint

Browse Source 
This is optional and there should be a configuration option for it if we're about to force it.
This commit is contained in:
Johnny Bergström 2012-11-15 15:09:06 +01:00
parent e24002740f
commit 865400e089
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
saltcloud/clouds/openstack.py
View File

@ -83,9 +83,11 @@ def get_conn():
authinfo = {
'ex_force_auth_url': __opts__['OPENSTACK.identity_url'],
'ex_force_auth_version': '2.0_password',
'ex_force_service_name': 'Compute',
}
if 'OPENSTACK.compute_name' in __opts__:
authinfo['ex_force_service_name'] = __opts__['OPENSTACK.compute_name']
if 'OPENSTACK.compute_region' in __opts__:
authinfo['ex_force_service_region'] = __opts__['OPENSTACK.compute_region']