openstack/deb-heat
Code Issues Proposed changes

Merge "Use region for cinder management uri"

Browse Source
This commit is contained in:
Jenkins 2014-01-24 15:23:50 +00:00 committed by Gerrit Code Review
commit 97dded3fb0
1 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
contrib/rackspace/heat/engine/plugins/clients.py
View File

@ -93,6 +93,15 @@ class Clients(clients.OpenStackClients):
'''Rackspace trove client.''' '''Rackspace trove client.'''
return super(Clients, self).trove(service_type="rax:database") return super(Clients, self).trove(service_type="rax:database")
def cinder(self):
"""Override the region for the cinder client."""
if not self._cinder:
super(Clients, self).cinder()
management_url = self.url_for(service_type='volume',
region_name=cfg.CONF.region_name)
self._cinder.client.management_url = management_url
return self._cinder
def __authenticate(self): def __authenticate(self):
pyrax.set_setting("identity_type", "keystone") pyrax.set_setting("identity_type", "keystone")
pyrax.set_setting("auth_endpoint", self.context.auth_url) pyrax.set_setting("auth_endpoint", self.context.auth_url)