Merge "Remove unused bindir config option"

This commit is contained in:
Zuul 2020-12-05 16:33:35 +00:00 committed by Gerrit Code Review
commit 7591f685c5
2 changed files with 5 additions and 20 deletions

View File

@ -16,7 +16,6 @@
# under the License.
import os
import sys
from oslo_config import cfg
@ -40,20 +39,6 @@ Possible values:
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',
@ -80,11 +65,6 @@ def basedir_def(*args):
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)

View File

@ -0,0 +1,5 @@
---
other:
- |
Remove the old config option ``bindir`` since it was used for
*nova-network* which had been removed.