~ubuntu-branches/ubuntu/vivid/heat/vivid

« back to all changes in this revision

Viewing changes to contrib/heat_barbican/heat_barbican/client.py

  • Committer: Package Import Robot
  • Author(s): Chuck Short
  • Date: 2015-04-15 13:55:31 UTC
  • mfrom: (1.1.24)
  • Revision ID: package-import@ubuntu.com-20150415135531-ife9cdiuch673nsf
Tags: 2015.1~rc1-0ubuntu1
* New upstream milestone release for Openstack kilo;
  - d/control: Align with upstream dependencies. 

Show diffs side-by-side

added added

removed removed

Lines of Context:
23
23
class BarbicanClientPlugin(client_plugin.ClientPlugin):
24
24
 
25
25
    def _create(self):
26
 
        keystone_client = self.clients.client('keystone').client
27
26
        endpoint_type = self._get_client_option('barbican', 'endpoint_type')
28
27
        endpoint = self.url_for(service_type='key-manager',
29
28
                                endpoint_type=endpoint_type)
30
 
        # Remove version if set
31
 
        endpoint = endpoint.rsplit("/", 1)[0]
 
29
        self._keystone_session.auth = self.context.auth_plugin
32
30
        client = barbican_client.Client(
33
 
            session=keystone_client.session, endpoint=endpoint)
 
31
            session=self._keystone_session, endpoint=endpoint)
34
32
 
35
33
        return client