Change state_path to use its default value

State_path is defined in gluon/conf/config.py, its default value is $gluon_home/gluon.
In the [default] section of the /etc/proton/proton.conf file, its value overrided to
/opt/proton/ which can cause confusion. This patch changes it back to use default value
for state_path defined in gluon/conf/config.py.

Change-Id: I6af2d7e04e51b0476430975c10cc01fca24c9d9d
This commit is contained in:
JinLi 2017-11-13 18:46:45 -08:00
parent 27f386ab68
commit 0bbfe4f360
3 changed files with 9 additions and 6 deletions

View File

@ -1,5 +1,5 @@
[DEFAULT]
state_path = /var/lib/proton
#
# From oslo.log
#
@ -350,5 +350,4 @@ state_path = /var/lib/proton
#bindir = $pybasedir/bin
# Top-level directory for maintaining gluon's state. (string value)
# (JinLi) use the one in [default]
#state_path = $pybasedir

View File

@ -1,7 +1,11 @@
# /etc/proton/proton.conf file
[DEFAULT]
state_path = /opt/proton
# state_path is defined in gluon/conf/config.py, its default value is $gluon_home/gluon.
# sqlite stores its database file in state_path, setting state_path here will
# overide its default value and move sqlite database from its default location
# i.e.: sqlite:////home/ubuntu/gluon/gluon/gluon.sqlite.
# state_path = /opt/proton
[api]
@ -11,7 +15,7 @@ auth_strategy = keystone
[keystone_authtoken]
# keystone identity, change 127.0.0.1 to keystone endpoint
auth_uri = http://127.0.0.1/5000
auth_uri = http://127.0.0.1:5000
project_domain_name = Default
@ -30,7 +34,7 @@ password = gluon
username = gluon
# keystone identity_admin, change 127.0.0.1 to keystone endpoint
auth_url = http://127.0.0.1/35357
auth_url = http://127.0.0.1:35357
auth_type = password

View File

@ -26,9 +26,9 @@ from gluon.sync_etcd.log import logupdate
# (enikher): for unittests
# for example, sqlite:////home/ubuntu/gluon/gluon/gluon.sqlite
_DEFAULT_SQL_CONNECTION = ('sqlite:///' +
paths.state_path_def('gluon.sqlite'))
db_options.set_defaults(
cfg.CONF, connection=_DEFAULT_SQL_CONNECTION)