Commit 9787639cc66c30bc2d4c41bdf90ed61d9420da81 - python-castellan

Merge "Rename barbican client import" Jenkins authored 6 years ago Gerrit Code Review committed 6 years ago

1 changed file(s) with 2 addition(s) and 2 deletion(s). Raw diff Collapse all Expand all

-2

castellan/key_manager/barbican_key_manager.py less more

40	40	from castellan.key_manager import key_manager
41	41
42	42
43		from barbicanclient import client as barbican_client
	43	from barbicanclient import client as barbican_client_import
44	44	from barbicanclient import exceptions as barbican_exceptions
45	45	from oslo_utils import timeutils
46	46	from six.moves import urllib

119	119	verify=self.conf.barbican.verify_ssl)
120	120
121	121	self._barbican_endpoint = self._get_barbican_endpoint(auth, sess)
122		self._barbican_client = barbican_client.Client(
	122	self._barbican_client = barbican_client_import.Client(
123	123	session=sess,
124	124	endpoint=self._barbican_endpoint)
125	125	self._current_context = context