diff --git a/nova/conf/paths.py b/nova/conf/paths.py index a89c21b01fef..6def9a2c79ac 100644 --- a/nova/conf/paths.py +++ b/nova/conf/paths.py @@ -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) diff --git a/releasenotes/notes/remove_bindir_option-dd164cd623a325b6.yaml b/releasenotes/notes/remove_bindir_option-dd164cd623a325b6.yaml new file mode 100644 index 000000000000..f00691682da7 --- /dev/null +++ b/releasenotes/notes/remove_bindir_option-dd164cd623a325b6.yaml @@ -0,0 +1,5 @@ +--- +other: + - | + Remove the old config option ``bindir`` since it was used for + *nova-network* which had been removed.