Remove $sqlite_db from default database connection

sqlite_db used to be a config option in the DEFAULT section. This
allowed it to be used in config template substitution. Now that it is in
the database section, the template substitution fails with a
NoSuchOptError.

The quick fix is to just hardcode the default connection option to refer
directly to 'cinder.sqlite' instead.

Closes bug: 1339295

Change-Id: Ifd2267aaa8c55d78f88ce6648badefe3f9f664ee

diff --git a/cinder/db/sqlalchemy/api.py b/cinder/db/sqlalchemy/api.py
index 643419a93644af9d721e782063bcfe88b644dd6b..7e7cb9f5f081cfdc64878d97ccb279ef5bad9a59 100644 (file)
--- a/cinder/db/sqlalchemy/api.py
+++ b/cinder/db/sqlalchemy/api.py
@@ -46,7 +46,7 @@ from cinder.openstack.common import uuidutils
 CONF = cfg.CONF
 LOG = logging.getLogger(__name__)
 
-options.set_defaults(sql_connection='sqlite:///$state_path/$sqlite_db',
+options.set_defaults(sql_connection='sqlite:///$state_path/cinder.sqlite',
                      sqlite_db='cinder.sqlite')
 
 _LOCK = threading.Lock()

diff --git a/etc/cinder/cinder.conf.sample b/etc/cinder/cinder.conf.sample
index 6eebf405cafd7347e907d024df4bc9b9897e8a65..7964eeb5f06af410ec9f2234883704f9457e2ee0 100644 (file)
--- a/etc/cinder/cinder.conf.sample
+++ b/etc/cinder/cinder.conf.sample
@@ -272,9 +272,10 @@
 # Port on which OpenStack Volume API listens (integer value)
 #osapi_volume_listen_port=8776
 
-# Number of workers for OpenStack Volume API service (integer
+# Number of workers for OpenStack Volume API service. The
+# default is equal to the number of CPUs available. (integer
 # value)
-#osapi_volume_workers=1
+#osapi_volume_workers=<None>
 
 
 #
@@ -1964,7 +1965,7 @@
 # Deprecated group/name - [DEFAULT]/sql_connection
 # Deprecated group/name - [DATABASE]/sql_connection
 # Deprecated group/name - [sql]/connection
-#connection=sqlite:///$state_path/$sqlite_db
+#connection=sqlite:///$state_path/cinder.sqlite
 
 # The SQL mode to be used for MySQL sessions. This option,
 # including the default, overrides any server-set SQL mode. To