From 9f0b6822f0b64853c4a221bf46baa3b78d326b83 Mon Sep 17 00:00:00 2001
From: lvdongbing <dongbing.lv@kylin-cloud.com>
Date: Tue, 2 Feb 2016 17:14:33 +0800
Subject: [PATCH] Remove old clients thoroughly

Bilean now use openstacksdk, old clients should be removed horoughly.

Change-Id: I2cb343f877f566e22415b90781854a597a0f6b97
---
 bilean/common/config.py  | 19 -------------------
 bilean/engine/service.py |  3 ---
 2 files changed, 22 deletions(-)

diff --git a/bilean/common/config.py b/bilean/common/config.py
index f18db88..6e1988a 100644
--- a/bilean/common/config.py
+++ b/bilean/common/config.py
@@ -76,23 +76,6 @@ authentication_opts = [
                help=_('Name of the domain for the service project.')),
 ]
 
-clients_group = cfg.OptGroup('clients')
-clients_opts = [
-    cfg.StrOpt('endpoint_type',
-               help=_(
-                   'Type of endpoint in Identity service catalog to use '
-                   'for communication with the OpenStack service.')),
-    cfg.StrOpt('ca_file',
-               help=_('Optional CA cert file to use in SSL connections.')),
-    cfg.StrOpt('cert_file',
-               help=_('Optional PEM-formatted certificate chain file.')),
-    cfg.StrOpt('key_file',
-               help=_('Optional PEM-formatted file that contains the '
-                      'private key.')),
-    cfg.BoolOpt('insecure',
-                help=_("If set, then the server's certificate will not "
-                       "be verified."))]
-
 client_http_log_debug_opts = [
     cfg.BoolOpt('http_log_debug',
                 default=False,
@@ -113,13 +96,11 @@ def list_opts():
     yield paste_deploy_group.name, paste_deploy_opts
     yield authentication_group.name, authentication_opts
     yield revision_group.name, revision_opts
-    yield clients_group.name, clients_opts
 
 
 cfg.CONF.register_group(paste_deploy_group)
 cfg.CONF.register_group(authentication_group)
 cfg.CONF.register_group(revision_group)
-cfg.CONF.register_group(clients_group)
 
 for group, opts in list_opts():
     cfg.CONF.register_opts(opts, group=group)
diff --git a/bilean/engine/service.py b/bilean/engine/service.py
index acdeec7..0df43c3 100644
--- a/bilean/engine/service.py
+++ b/bilean/engine/service.py
@@ -27,7 +27,6 @@ from bilean.common.i18n import _LI
 from bilean.common import messaging as rpc_messaging
 from bilean.common import schema
 from bilean.common import utils
-from bilean.engine import clients as bilean_clients
 from bilean.engine import environment
 from bilean.engine import event as event_mod
 from bilean.engine import policy as policy_mod
@@ -75,8 +74,6 @@ class EngineService(service.Service):
         self.target = None
         self._rpc_server = None
 
-        bilean_clients.initialise()
-
         if context is None:
             self.context = bilean_context.get_admin_context()