Importing from trove-client compat first
- Switched the logic so that the compat version is imported first Fixes bug #1250237 Change-Id: I7650fc6c3ce93164ca8bee610d5fe2293df3ecc7
This commit is contained in:
parent
3649ac7d23
commit
7a75fda949
@ -39,11 +39,11 @@ from neutronclient.v2_0 import client as neutron_client
|
|||||||
from novaclient.v1_1 import client as nova_client
|
from novaclient.v1_1 import client as nova_client
|
||||||
from swiftclient import client as swift_client
|
from swiftclient import client as swift_client
|
||||||
try:
|
try:
|
||||||
from troveclient import client as trove_client
|
from troveclient.compat import client as trove_client
|
||||||
with_trove = True
|
with_trove = True
|
||||||
except ImportError:
|
except ImportError:
|
||||||
try:
|
try:
|
||||||
from troveclient.compat import client as trove_client
|
from troveclient import client as trove_client
|
||||||
with_trove = True
|
with_trove = True
|
||||||
except ImportError:
|
except ImportError:
|
||||||
with_trove = False
|
with_trove = False
|
||||||
|
Loading…
Reference in New Issue
Block a user