Set a sane default for state_path
This change set a sane default to state_path, removed no more used cfg options, and put the previous state_path for tests only. DocImpact Closes bug: #1240879 Change-Id: If56b60950d8ebf9111ef99bfbf2cb549bbb6b29b
This commit is contained in:
parent
4b259c6a15
commit
4df8093c30
|
@ -25,7 +25,6 @@ stepping stone.
|
|||
|
||||
"""
|
||||
|
||||
import os
|
||||
import socket
|
||||
|
||||
from oslo.config import cfg
|
||||
|
@ -59,13 +58,9 @@ core_opts = [
|
|||
cfg.StrOpt('api_paste_config',
|
||||
default="api-paste.ini",
|
||||
help='File name for the paste.deploy config for cinder-api'),
|
||||
cfg.StrOpt('pybasedir',
|
||||
default=os.path.abspath(os.path.join(os.path.dirname(__file__),
|
||||
'..',
|
||||
'..')),
|
||||
help='Directory where the cinder python module is installed'),
|
||||
cfg.StrOpt('state_path',
|
||||
default='$pybasedir',
|
||||
default='/var/lib/cinder',
|
||||
deprecated_name='pybasedir',
|
||||
help="Top-level directory for maintaining cinder's state"), ]
|
||||
|
||||
debug_opts = [
|
||||
|
|
|
@ -14,6 +14,7 @@
|
|||
# License for the specific language governing permissions and limitations
|
||||
# under the License.
|
||||
|
||||
import os
|
||||
|
||||
from oslo.config import cfg
|
||||
|
||||
|
@ -50,3 +51,5 @@ def set_defaults(conf):
|
|||
conf.set_default('fixed_key', default='0' * 64, group='keymgr')
|
||||
conf.set_default('scheduler_driver',
|
||||
'cinder.scheduler.filter_scheduler.FilterScheduler')
|
||||
conf.set_default('state_path', os.path.abspath(
|
||||
os.path.join(os.path.dirname(__file__), '..', '..')))
|
||||
|
|
|
@ -237,13 +237,10 @@
|
|||
# value)
|
||||
#api_paste_config=api-paste.ini
|
||||
|
||||
# Directory where the cinder python module is installed
|
||||
# (string value)
|
||||
#pybasedir=/usr/lib/python/site-packages
|
||||
|
||||
# Top-level directory for maintaining cinder's state (string
|
||||
# value)
|
||||
#state_path=$pybasedir
|
||||
# Deprecated group/name - [DEFAULT]/pybasedir
|
||||
#state_path=/var/lib/cinder
|
||||
|
||||
# ip address of this host (string value)
|
||||
#my_ip=10.0.0.1
|
||||
|
|
Loading…
Reference in New Issue