diff --git a/setup.cfg b/setup.cfg index a83f3573..8334ca8d 100644 --- a/setup.cfg +++ b/setup.cfg @@ -26,7 +26,6 @@ packages = console_scripts = tuskar-api = tuskar.cmd.api:main tuskar-dbsync = tuskar.cmd.dbsync:main - tuskar-manager = tuskar.cmd.manager:main [build_sphinx] all_files = 1 diff --git a/tuskar/cmd/manager.py b/tuskar/cmd/manager.py deleted file mode 100644 index dd8bb510..00000000 --- a/tuskar/cmd/manager.py +++ /dev/null @@ -1,40 +0,0 @@ -#!/usr/bin/env python -# -# Copyright 2013 Hewlett-Packard Development Company, L.P. -# All Rights Reserved. -# -# Licensed under the Apache License, Version 2.0 (the "License"); you may -# not use this file except in compliance with the License. You may obtain -# a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT -# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the -# License for the specific language governing permissions and limitations -# under the License. - -""" -The Tuskar Management Service -""" - -import sys - -from oslo.config import cfg - -from tuskar.common import service as tuskar_service -from tuskar.manager import manager -from tuskar.openstack.common import service - -CONF = cfg.CONF - - -def main(): - # Pase config file and command line options, then start logging - tuskar_service.prepare_service(sys.argv) - - topic = 'tuskar.manager' - mgr = manager.ManagerService(CONF.host, topic) - launcher = service.launch(mgr) - launcher.wait() diff --git a/tuskar/manager/manager.py b/tuskar/manager/manager.py deleted file mode 100644 index b691804d..00000000 --- a/tuskar/manager/manager.py +++ /dev/null @@ -1,48 +0,0 @@ - -# Copyright 2013 Hewlett-Packard Development Company, L.P. -# All Rights Reserved. -# -# Licensed under the Apache License, Version 2.0 (the "License"); you may -# not use this file except in compliance with the License. You may obtain -# a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT -# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the -# License for the specific language governing permissions and limitations -# under the License. - -from tuskar.common import service -from tuskar.openstack.common import log - -LOG = log.getLogger(__name__) - - -class ManagerService(service.PeriodicService): - """Tuskar Manager Service. - - A single instance of this class is created within the tuskar-manager - process. - """ - - def __init__(self, host, topic): - super(ManagerService, self).__init__(host, topic) - - def start(self): - super(ManagerService, self).start() - # TODO(deva): connect with storage driver - - def initialize(self, service): - LOG.debug('Manager initializing service hooks') - # TODO(deva) - - def process_notification(self, notification): - LOG.debug( - 'Received notification: %r' % notification.get('event_type')) - # TODO(deva) - - def periodic_tasks(self, context): - # TODO(deva) - pass