773aa20a4a
oslo_config provide a utility for generating sample config files, which provide more detail about opts, like Minimum/Maximum value and Allowed values. So drop Ironic's "generate_sample.sh" which was copied from oslo-incubator long time ago. Add a new entry point "ironic" under oslo.config.opts namespace to explore config options to oslo-config-generator. After this patch, new config options of Ironic code should register with ironic/conf/opts.py. New external libraries should register with tools/config/ironic-config-generator.conf There is a bug #1554657 with oslo-config about deprecated_group. This bug have impact of some configs from keystonemiddleware and oslo.messaging in ironic.conf.sample So currently, deprecated option should always add the deprecated_group even it didn't alter the group, otherwise the deprecated group value will be 'DEFAULT'. Update etc/ironic/ironic.conf.sample via running 'tox -egenconfig'. Closes-Bug: #1564195 Change-Id: If7721e98e69b6f54f1ee04a07477396b86583371
71 lines
2.2 KiB
Python
71 lines
2.2 KiB
Python
# Copyright 2010 United States Government as represented by the
|
|
# Administrator of the National Aeronautics and Space Administration.
|
|
# All Rights Reserved.
|
|
# Copyright 2012 Red Hat, 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.
|
|
|
|
import os
|
|
|
|
from oslo_config import cfg
|
|
|
|
from ironic.common.i18n import _
|
|
|
|
path_opts = [
|
|
cfg.StrOpt('pybasedir',
|
|
default=os.path.abspath(os.path.join(os.path.dirname(__file__),
|
|
'../')),
|
|
sample_default='/usr/lib/python/site-packages/ironic/ironic',
|
|
help=_('Directory where the ironic python module is '
|
|
'installed.')),
|
|
cfg.StrOpt('bindir',
|
|
default='$pybasedir/bin',
|
|
help=_('Directory where ironic binaries are installed.')),
|
|
cfg.StrOpt('state_path',
|
|
default='$pybasedir',
|
|
help=_("Top-level directory for maintaining ironic's state.")),
|
|
]
|
|
|
|
CONF = cfg.CONF
|
|
CONF.register_opts(path_opts)
|
|
|
|
|
|
def basedir_def(*args):
|
|
"""Return an uninterpolated path relative to $pybasedir."""
|
|
return os.path.join('$pybasedir', *args)
|
|
|
|
|
|
def bindir_def(*args):
|
|
"""Return an uninterpolated path relative to $bindir."""
|
|
return os.path.join('$bindir', *args)
|
|
|
|
|
|
def state_path_def(*args):
|
|
"""Return an uninterpolated path relative to $state_path."""
|
|
return os.path.join('$state_path', *args)
|
|
|
|
|
|
def basedir_rel(*args):
|
|
"""Return a path relative to $pybasedir."""
|
|
return os.path.join(CONF.pybasedir, *args)
|
|
|
|
|
|
def bindir_rel(*args):
|
|
"""Return a path relative to $bindir."""
|
|
return os.path.join(CONF.bindir, *args)
|
|
|
|
|
|
def state_path_rel(*args):
|
|
"""Return a path relative to $state_path."""
|
|
return os.path.join(CONF.state_path, *args)
|