openstack/placement
Code Issues Proposed changes

Merge "Config options: centralize section "scheduler""

Browse Source
This commit is contained in:
Jenkins 2015-12-08 21:57:35 +00:00 committed by Gerrit Code Review
commit 5f343ea96c
2 changed files with 4 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nova/conf/__init__.py
View File

@ -19,8 +19,10 @@
from oslo_config import cfg from oslo_config import cfg
from nova.conf import scheduler
from nova.conf import serial_console from nova.conf import serial_console
CONF = cfg.CONF CONF = cfg.CONF
scheduler.register_opts(CONF)
serial_console.register_opts(CONF) serial_console.register_opts(CONF)

13
nova/scheduler/filters/aggregate_image_properties_isolation.py
View File

@ -13,23 +13,14 @@
# License for the specific language governing permissions and limitations # License for the specific language governing permissions and limitations
# under the License. # under the License.
from oslo_config import cfg
from oslo_log import log as logging from oslo_log import log as logging
import six import six
import nova.conf
from nova.scheduler import filters from nova.scheduler import filters
from nova.scheduler.filters import utils from nova.scheduler.filters import utils
opts = [ CONF = nova.conf.CONF
cfg.StrOpt('aggregate_image_properties_isolation_namespace',
help='Force the filter to consider only keys matching '
'the given namespace.'),
cfg.StrOpt('aggregate_image_properties_isolation_separator',
default=".",
help='The separator used between the namespace and keys'),
]
CONF = cfg.CONF
CONF.register_opts(opts)
LOG = logging.getLogger(__name__) LOG = logging.getLogger(__name__)