openstack/castellan
Code Issues Proposed changes

Merge "Rename barbican client import"

Browse Source
This commit is contained in:
Jenkins 2017-07-31 11:36:09 +00:00 committed by Gerrit Code Review
commit 9787639cc6
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
castellan/key_manager/barbican_key_manager.py
View File

@ -41,7 +41,7 @@ from castellan.i18n import _
from castellan.key_manager import key_manager
from barbicanclient import client as barbican_client
from barbicanclient import client as barbican_client_import
from barbicanclient import exceptions as barbican_exceptions
from oslo_utils import timeutils
from six.moves import urllib
@ -120,7 +120,7 @@ class BarbicanKeyManager(key_manager.KeyManager):
verify=self.conf.barbican.verify_ssl)
self._barbican_endpoint = self._get_barbican_endpoint(auth, sess)
self._barbican_client = barbican_client.Client(
self._barbican_client = barbican_client_import.Client(
session=sess,
endpoint=self._barbican_endpoint)
self._current_context = context