From: Steven Dake Date: Thu, 21 Jun 2012 22:05:00 +0000 (-0700) Subject: Remove service name from nova() def X-Git-Tag: 2014.1~1689 X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=e30ee55ff99db36af97f18716e19a521c36c3543;p=openstack-build%2Fheat-build.git 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 --- diff --git a/heat/engine/resources.py b/heat/engine/resources.py index 2764feb7..c9072a1a 100644 --- a/heat/engine/resources.py +++ b/heat/engine/resources.py @@ -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):