Remove service name from nova() def
The service_name field is not unique between distros or versions of openstack, but is used to select endpoints for communication with nova and volume services. The nova client will sort out the correct operation based upon the service_type field. The service_name field should probably just be removed from the API definition upstream. Tested on F16 & Devstack U12. Change-Id: I36409dba9d9ec2b453a027fc1e2e78f7c8ace2a2 Signed-off-by: Steven Dake <sdake@redhat.com>
This commit is contained in:
parent
acf8334a1f
commit
e30ee55ff9
|
@ -120,11 +120,6 @@ class Resource(object):
|
|||
if service_type in self._nova:
|
||||
return self._nova[service_type]
|
||||
|
||||
if service_type == 'compute':
|
||||
service_name = 'nova'
|
||||
else:
|
||||
service_name = None
|
||||
|
||||
con = self.stack.context
|
||||
self._nova[service_type] = nc.Client(con.username,
|
||||
con.password,
|
||||
|
@ -132,8 +127,7 @@ class Resource(object):
|
|||
con.auth_url,
|
||||
proxy_token=con.auth_token,
|
||||
proxy_tenant_id=con.tenant_id,
|
||||
service_type=service_type,
|
||||
service_name=service_name)
|
||||
service_type=service_type)
|
||||
return self._nova[service_type]
|
||||
|
||||
def calculate_properties(self):
|
||||
|
|
Loading…
Reference in New Issue