Merge "Cleanup the orchestration client init and attr"
diff --git a/tempest/clients.py b/tempest/clients.py
index ee12a5e..85c2242 100644
--- a/tempest/clients.py
+++ b/tempest/clients.py
@@ -18,7 +18,6 @@
from tempest.lib import exceptions as lib_exc
from tempest.lib.services import clients
from tempest.services import object_storage
-from tempest.services import orchestration
CONF = config.CONF
@@ -49,15 +48,6 @@
self._set_image_clients()
self._set_network_clients()
- self.orchestration_client = orchestration.OrchestrationClient(
- self.auth_provider,
- CONF.orchestration.catalog_type,
- CONF.orchestration.region or CONF.identity.region,
- endpoint_type=CONF.orchestration.endpoint_type,
- build_interval=CONF.orchestration.build_interval,
- build_timeout=CONF.orchestration.build_timeout,
- **self.default_params)
-
def _set_network_clients(self):
self.network_agents_client = self.network.AgentsClient()
self.network_extensions_client = self.network.ExtensionsClient()
diff --git a/tempest/cmd/cleanup_service.py b/tempest/cmd/cleanup_service.py
index f1c0a3e..11cd4bb 100644
--- a/tempest/cmd/cleanup_service.py
+++ b/tempest/cmd/cleanup_service.py
@@ -213,7 +213,9 @@
class StackService(BaseService):
def __init__(self, manager, **kwargs):
super(StackService, self).__init__(kwargs)
- self.client = manager.orchestration_client
+ params = config.service_client_config('orchestration')
+ self.client = manager.orchestration.OrchestrationClient(
+ manager.auth_provider, **params)
def list(self):
client = self.client