openstack
/
placement
Code Issues Proposed changes

Merge "Update code and opts in conf/paths.py for placement"

This commit is contained in:
Zuul 2018-09-14 20:44:57 +00:00 committed by Gerrit Code Review
parent cb39c55f3d fb6c99feec
commit 8895f4ae31
1 changed files with 7 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
placement/conf/paths.py
View File

@ -16,21 +16,20 @@
# under the License.
import os
import sys
from oslo_config import cfg
ALL_OPTS = [
cfg.StrOpt('pybasedir',
default=os.path.abspath(os.path.join(os.path.dirname(__file__),
'../../')),
sample_default='<Path>',
help="""
The directory where the Nova python modules are installed.
The directory where the Placement python modules are installed.
This directory is used to store template files for networking and remote
console access. It is also the default path for other config options which
need to persist Nova internal data. It is very unlikely that you need to
This is the default path for other config options which need to persist
Placement internal data. It is very unlikely that you need to
change this option from its default value.
Possible values:
@ -41,32 +40,13 @@ Related options:
* ``state_path``
"""),
cfg.StrOpt('bindir',
default=os.path.join(sys.prefix, 'local', 'bin'),
help="""
The directory where the Nova binaries are installed.
This option is only relevant if the networking capabilities from Nova are
used (see services below). Nova's networking capabilities are targeted to
be fully replaced by Neutron in the future. It is very unlikely that you need
to change this option from its default value.
Possible values:
* The full path to a directory.
"""),
cfg.StrOpt('state_path',
default='$pybasedir',
help="""
The top-level directory for maintaining Nova's state.
The top-level directory for maintaining state used in Placement.
This directory is used to store Nova's internal state. It is used by a
variety of other config options which derive from this. In some scenarios
(for example migrations) it makes sense to use a storage location which is
shared between multiple compute hosts (for example via NFS). Unless the
option ``instances_path`` gets overwritten, this directory can grow very
large.
This directory is used to store Placement's internal state. It is used by some
tests that have behaviors carried over from Nova.
Possible values:
@ -75,16 +55,6 @@ Possible values:
]
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)