09dd7bf800
Reverting the change to the default value of state_path introduced by I94502bcfac8b372271acd0dbc1710c0e3009b8e1 for the reasons set out in my -1 review of the same that seems to have been skipped when the change was accepted. As implemented the change will break any existing systems that are using the default value of state_path with no warning period, which goes beyond the scope of change for UpgradeImpact A better approach would be to introduce a new config value that is used in the code, but is over-ridden by "state_path" if it is still in the config file, and log a warning that state_path is deprecated and will be removed in the future. That way the change to default behavior can be introduced at the start of the next release cycle by removing the deprecated state_path config value, and users have until then to prepare. It does mean that we keep the insane default for a bit longer, but I think that's much better that breaking a running system. Closes-bug: #1291515 Change-Id: I7bb70c551ec9616276552d2e32076b66a1d3ce01
68 lines
2.1 KiB
Python
68 lines
2.1 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
|
|
import sys
|
|
|
|
from oslo.config import cfg
|
|
|
|
path_opts = [
|
|
cfg.StrOpt('pybasedir',
|
|
default=os.path.abspath(os.path.join(os.path.dirname(__file__),
|
|
'../')),
|
|
help='Directory where the nova python module is installed'),
|
|
cfg.StrOpt('bindir',
|
|
default=os.path.join(sys.prefix, 'local', 'bin'),
|
|
help='Directory where nova binaries are installed'),
|
|
cfg.StrOpt('state_path',
|
|
default='$pybasedir',
|
|
help="Top-level directory for maintaining nova'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)
|