Merge "Optimize import inside trove.common.remote.neutron_client"
This commit is contained in:
commit
7bddc1ae80
@ -21,6 +21,7 @@ from trove.common.strategies.cluster import strategy
|
|||||||
|
|
||||||
from cinderclient.v2 import client as CinderClient
|
from cinderclient.v2 import client as CinderClient
|
||||||
from keystoneclient.service_catalog import ServiceCatalog
|
from keystoneclient.service_catalog import ServiceCatalog
|
||||||
|
from neutronclient.v2_0 import client as NeutronClient
|
||||||
from novaclient.client import Client
|
from novaclient.client import Client
|
||||||
from swiftclient.client import Connection
|
from swiftclient.client import Connection
|
||||||
|
|
||||||
@ -153,7 +154,6 @@ def swift_client(context, region_name=None):
|
|||||||
|
|
||||||
|
|
||||||
def neutron_client(context, region_name=None):
|
def neutron_client(context, region_name=None):
|
||||||
from neutronclient.v2_0 import client as NeutronClient
|
|
||||||
if CONF.neutron_url:
|
if CONF.neutron_url:
|
||||||
# neutron endpoint url / publicURL does not include tenant segment
|
# neutron endpoint url / publicURL does not include tenant segment
|
||||||
url = CONF.neutron_url
|
url = CONF.neutron_url
|
||||||
|
Loading…
x
Reference in New Issue
Block a user