config options: Centralize mks options
The config options of mks got moved to the new central location "nova/conf/mks.py” Change-Id: I17c6f4acb0c4803017b23edfce6942bd2221336a Implements: blueprint centralize-config-options-newton
This commit is contained in:
parent
ce5f9c609f
commit
1284e2a269
@ -267,8 +267,6 @@ CONF.register_opts(instance_cleaning_opts)
|
||||
CONF.import_opt('console_topic', 'nova.console.rpcapi')
|
||||
CONF.import_opt('host', 'nova.netconf')
|
||||
CONF.import_opt('enabled', 'nova.spice', group='spice')
|
||||
CONF.import_opt('enabled', 'nova.mks', group='mks')
|
||||
CONF.import_opt('mksproxy_base_url', 'nova.mks', group='mks')
|
||||
|
||||
LOG = logging.getLogger(__name__)
|
||||
|
||||
|
@ -52,6 +52,7 @@ from nova.conf import ironic
|
||||
from nova.conf import keymgr
|
||||
# from nova.conf import keystone_authtoken
|
||||
# from nova.conf import libvirt
|
||||
from nova.conf import mks
|
||||
# from nova.conf import matchmaker_redis
|
||||
# from nova.conf import metadata
|
||||
# from nova.conf import metrics
|
||||
@ -107,6 +108,7 @@ glance.register_opts(CONF)
|
||||
# guestfs.register_opts(CONF)
|
||||
# host.register_opts(CONF)
|
||||
hyperv.register_opts(CONF)
|
||||
mks.register_opts(CONF)
|
||||
# image.register_opts(CONF)
|
||||
# imagecache.register_opts(CONF)
|
||||
image_file_url.register_opts(CONF)
|
||||
|
40
nova/conf/mks.py
Normal file
40
nova/conf/mks.py
Normal file
@ -0,0 +1,40 @@
|
||||
# Copyright 2016 OpenStack Foundation
|
||||
# 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 oslo_config import cfg
|
||||
|
||||
mks_group = cfg.OptGroup('mks', title='MKS Options')
|
||||
|
||||
mks_opts = [
|
||||
cfg.StrOpt('mksproxy_base_url',
|
||||
default='http://127.0.0.1:6090/',
|
||||
help='Location of MKS web console proxy, in the form '
|
||||
'"http://127.0.0.1:6090/"'),
|
||||
cfg.BoolOpt('enabled',
|
||||
default=False,
|
||||
help='Enable MKS related features'),
|
||||
]
|
||||
|
||||
ALL_MKS_OPTS = mks_opts
|
||||
|
||||
|
||||
def register_opts(conf):
|
||||
conf.register_group(mks_group)
|
||||
conf.register_opts(ALL_MKS_OPTS, group = mks_group)
|
||||
|
||||
|
||||
def list_opts():
|
||||
return {mks_group: ALL_MKS_OPTS}
|
@ -1,31 +0,0 @@
|
||||
# Copyright 2015 VMware Inc.
|
||||
#
|
||||
# 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.
|
||||
|
||||
"""Module for MKS consoles."""
|
||||
|
||||
from oslo_config import cfg
|
||||
|
||||
|
||||
mks_opts = [
|
||||
cfg.StrOpt('mksproxy_base_url',
|
||||
default='http://127.0.0.1:6090/',
|
||||
help='Location of MKS web console proxy, in the form '
|
||||
'"http://127.0.0.1:6090/"'),
|
||||
cfg.BoolOpt('enabled',
|
||||
default=False,
|
||||
help='Enable MKS related features'),
|
||||
]
|
||||
|
||||
CONF = cfg.CONF
|
||||
CONF.register_opts(mks_opts, group='mks')
|
Loading…
Reference in New Issue
Block a user