Cleanup requires

This commit is contained in:
Endre Karlson 2014-11-12 01:48:41 +01:00
parent 17449b4e92
commit bfc00248e3
3 changed files with 2 additions and 67 deletions

View File

@ -20,14 +20,11 @@ import socket
import sys
from oslo.config import cfg
from oslo import messaging
from oslo.utils import importutils
# from cue.common import config
from cue.common.i18n import _LE
from cue.common.i18n import _LI
# from cue.common import rpc
# from cue.objects import base as objects_base
from cue.openstack.common import context
from cue.openstack.common import log
from cue.openstack.common import service
@ -50,53 +47,6 @@ cfg.CONF.register_opts(service_opts)
LOG = log.getLogger(__name__)
# class RPCService(service.Service):
#
# def __init__(self, host, manager_module, manager_class):
# super(RPCService, self).__init__()
# self.host = host
# manager_module = importutils.try_import(manager_module)
# manager_class = getattr(manager_module, manager_class)
# self.manager = manager_class(host, manager_module.MANAGER_TOPIC)
# self.topic = self.manager.topic
# self.rpcserver = None
#
# def start(self):
# super(RPCService, self).start()
# admin_context = context.RequestContext('admin', 'admin', is_admin=True)
# self.tg.add_dynamic_timer(
# self.manager.periodic_tasks,
# periodic_interval_max=cfg.CONF.periodic_interval,
# context=admin_context)
#
# self.manager.init_host()
# target = messaging.Target(topic=self.topic, server=self.host)
# endpoints = [self.manager]
# serializer = objects_base.cueObjectSerializer()
# self.rpcserver = rpc.get_server(target, endpoints, serializer)
# self.rpcserver.start()
# LOG.info(_LI('Created RPC server for service %(service)s on host '
# '%(host)s.'),
# {'service': self.topic, 'host': self.host})
#
# def stop(self):
# super(RPCService, self).stop()
# try:
# self.rpcserver.stop()
# self.rpcserver.wait()
# except Exception as e:
# LOG.exception(_LE('Service error occurred when stopping the '
# 'RPC server. Error: %s'), e)
# try:
# self.manager.del_host()
# except Exception as e:
# LOG.exception(_LE('Service error occurred when cleaning up '
# 'the RPC manager. Error: %s'), e)
# LOG.info(_LI('Stopped RPC server for service %(service)s on host '
# '%(host)s.'),
# {'service': self.topic, 'host': self.host})
def prepare_service(argv=[]):
log_levels = (cfg.CONF.default_log_levels +
@ -107,6 +57,4 @@ def prepare_service(argv=[]):
argv = sys.argv
cfg.CONF(argv[1:], project='cue')
log.setup('cue')
#messaging.setup()

View File

@ -5,23 +5,12 @@ pbr>=0.6,!=0.7,<1.0
SQLAlchemy>=0.8.4,<=0.8.99,>=0.9.7,<=0.9.99
alembic>=0.6.4
anyjson>=0.3.3
argparse
eventlet>=0.15.2
lockfile>=0.8
lxml>=2.3
WebOb>=1.2.3
greenlet>=0.3.2
sqlalchemy-migrate>=0.9.1,!=0.9.2
netaddr>=0.7.12
paramiko>=1.13.0
iso8601>=0.1.9
python-neutronclient>=2.3.6,<3
python-glanceclient>=0.14.0
python-keystoneclient>=0.11.1
python-swiftclient>=2.2.0
stevedore>=1.0.0 # Apache-2.0
pysendfile==2.0.0
websockify>=0.6.0,<0.7
oslo.config>=1.4.0 # Apache-2.0
oslo.db>=1.0.0 # Apache-2.0
-e git+https://github.com/openstack/oslo.log.git#egg=oslo.log
@ -33,8 +22,7 @@ pecan>=0.5.0
six>=1.7.0
jsonpatch>=1.1
WSME>=0.6
Jinja2
keystonemiddleware>=1.0.0
oslo.messaging>=1.4.0
retrying>=1.2.2,!=1.3.0 # Apache-2.0
paramiko
posix_ipc
taskflow

View File

@ -7,7 +7,6 @@ discover
fixtures>=0.3.14
mock>=1.0
Babel>=1.3
MySQL-python
oslotest>=1.1.0 # Apache-2.0
python-subunit>=0.0.18
testrepository>=0.0.18