b7091b4d52
The cfg API is now available via the oslo-config library, so switch to it and remove the copied-and-pasted version. Add the 2013.1b4 tarball to tools/pip-requires - this will be changed to 'oslo-config>=2013.1' when oslo-config is published to pypi. This will happen in time for grizzly final. Add dependency_links to setup.py so that oslo-config can be installed from the tarball URL specified in pip-requires. Remove the 'deps = pep8==1.3.3' from tox.ini as it means all the other deps get installed with easy_install which can't install oslo-config from the URL. Make tools/hacking.py include oslo in IMPORT_EXCEPTIONS like it already does for paste. It turns out imp.find_module() doesn't correct handle namespace packages. Retain dummy cfg.py file until keystoneclient middleware has been updated (I18c450174277c8e2d15ed93879da6cd92074c27a). Change-Id: I4815aeb8a9341a31a250e920157f15ee15cfc5bc
79 lines
2.9 KiB
Python
79 lines
2.9 KiB
Python
# vim: tabstop=4 shiftwidth=4 softtabstop=4
|
|
|
|
# Copyright (c) 2010 OpenStack, LLC.
|
|
# Copyright 2010 United States Government as represented by the
|
|
# Administrator of the National Aeronautics and Space Administration.
|
|
# 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.
|
|
|
|
"""
|
|
Scheduler that allows routing some calls to one driver and others to another.
|
|
|
|
This scheduler was originally used to deal with both compute and volume. But
|
|
is now used for openstack extensions that want to use the nova-scheduler to
|
|
schedule requests to compute nodes but provide their own manager and topic.
|
|
|
|
https://bugs.launchpad.net/nova/+bug/1009681
|
|
"""
|
|
|
|
from oslo.config import cfg
|
|
|
|
from nova.openstack.common import importutils
|
|
from nova.scheduler import driver
|
|
|
|
|
|
multi_scheduler_opts = [
|
|
cfg.StrOpt('compute_scheduler_driver',
|
|
default='nova.scheduler.'
|
|
'filter_scheduler.FilterScheduler',
|
|
help='Driver to use for scheduling compute calls'),
|
|
cfg.StrOpt('default_scheduler_driver',
|
|
default='nova.scheduler.chance.ChanceScheduler',
|
|
help='Default driver to use for scheduling calls'),
|
|
]
|
|
|
|
CONF = cfg.CONF
|
|
CONF.register_opts(multi_scheduler_opts)
|
|
|
|
|
|
class MultiScheduler(driver.Scheduler):
|
|
"""A scheduler that holds multiple sub-schedulers.
|
|
|
|
This exists to allow flag-driven composibility of schedulers, allowing
|
|
third parties to integrate custom schedulers more easily.
|
|
|
|
"""
|
|
|
|
def __init__(self):
|
|
super(MultiScheduler, self).__init__()
|
|
compute_driver = importutils.import_object(
|
|
CONF.compute_scheduler_driver)
|
|
default_driver = importutils.import_object(
|
|
CONF.default_scheduler_driver)
|
|
|
|
self.drivers = {'compute': compute_driver,
|
|
'default': default_driver}
|
|
|
|
def schedule_run_instance(self, *args, **kwargs):
|
|
return self.drivers['compute'].schedule_run_instance(*args, **kwargs)
|
|
|
|
def schedule_prep_resize(self, *args, **kwargs):
|
|
return self.drivers['compute'].schedule_prep_resize(*args, **kwargs)
|
|
|
|
def update_service_capabilities(self, service_name, host, capabilities):
|
|
# Multi scheduler is only a holder of sub-schedulers, so
|
|
# pass the capabilities to the schedulers that matter
|
|
for d in self.drivers.values():
|
|
d.update_service_capabilities(service_name, host, capabilities)
|