Protect cinderclient import

Importing cinderclient breaks logging setups. Luckily, we only need it
in one function, so late-import it.

Change-Id: I86f090e8f3bbd3ac57e221df6629c6e008c99aa8
This commit is contained in:
Monty Taylor
2016-08-12 07:28:30 -05:00
parent cca0fb3e0a
commit 71a7058a2d

View File

@@ -25,7 +25,6 @@ import warnings
from dogpile import cache
import requestsexceptions
import cinderclient.client
import cinderclient.exceptions as cinder_exceptions
import glanceclient
import glanceclient.exc
@@ -847,6 +846,9 @@ class OpenStackCloud(object):
@property
def cinder_client(self):
# Import cinderclient late because importing it at the top level
# breaks logging for users of shade
import cinderclient.client
if self._cinder_client is None:
self._cinder_client = self._get_client(
'volume', cinderclient.client.Client)