From 865400e0892f3f68bf278ceb998a85bb871d9274 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Johnny=20Bergstro=CC=88m?= Date: Thu, 15 Nov 2012 15:09:06 +0100 Subject: [PATCH] Don't force a name for compute endpoint This is optional and there should be a configuration option for it if we're about to force it. --- saltcloud/clouds/openstack.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/saltcloud/clouds/openstack.py b/saltcloud/clouds/openstack.py index 4ec3483b4d..f1f02504e1 100644 --- a/saltcloud/clouds/openstack.py +++ b/saltcloud/clouds/openstack.py @@ -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']