From 1284e2a269bfc8f4f1c1f45cfa96027c5f6d25e4 Mon Sep 17 00:00:00 2001 From: Anusha Unnam Date: Wed, 30 Mar 2016 20:52:32 +0000 Subject: [PATCH] config options: Centralize mks options MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 --- nova/compute/manager.py | 2 -- nova/conf/__init__.py | 2 ++ nova/conf/mks.py | 40 ++++++++++++++++++++++++++++++++++++++++ nova/mks/__init__.py | 31 ------------------------------- 4 files changed, 42 insertions(+), 33 deletions(-) create mode 100644 nova/conf/mks.py delete mode 100644 nova/mks/__init__.py diff --git a/nova/compute/manager.py b/nova/compute/manager.py index abce02756e45..12538e574da9 100644 --- a/nova/compute/manager.py +++ b/nova/compute/manager.py @@ -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__) diff --git a/nova/conf/__init__.py b/nova/conf/__init__.py index ce55500814ea..17fc216cccd1 100644 --- a/nova/conf/__init__.py +++ b/nova/conf/__init__.py @@ -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) diff --git a/nova/conf/mks.py b/nova/conf/mks.py new file mode 100644 index 000000000000..74e86a83642d --- /dev/null +++ b/nova/conf/mks.py @@ -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} diff --git a/nova/mks/__init__.py b/nova/mks/__init__.py deleted file mode 100644 index 6bfc5235dbcd..000000000000 --- a/nova/mks/__init__.py +++ /dev/null @@ -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')