Set the database.connection option default value

This was previously set right before ironic-api start, but the
default value must also be present for ironic-dbsync calls.

Note: the default value of database.connection is changed here - from
now on the sqlite database will be stored in ./ironic/ironic.sqlite
instead of ./ironic/openstack/common/db/ironic.sqlite.

Closes-Bug: #1290645

Change-Id: I2c2ab2f10a99ffd564611351e71c0b88adc20ba7

doc/source/dev/dev-quickstart.rst

@@ -133,7 +133,7 @@ created in the previous section to run everything else within::
     sed -i "s/#host=.*/host=test-host/" etc/ironic/ironic.conf.local
 
     # initialize the ironic database
-    # this defaults to storing data in ./ironic/openstack/common/db/ironic.sqlite
+    # this defaults to storing data in ./ironic/ironic.sqlite
 
     # If using MySQL, you need to create the initial database
     # mysql -u root -e "create schema ironic"

ironic/common/config.py

@@ -17,17 +17,11 @@
 
 from oslo.config import cfg
 
-from ironic.common import paths
-from ironic.openstack.common.db import options
 from ironic.openstack.common import rpc
 from ironic import version
 
-_DEFAULT_SQL_CONNECTION = 'sqlite:///' + paths.state_path_def('$sqlite_db')
-
 
 def parse_args(argv, default_config_files=None):
-    options.set_defaults(sql_connection=_DEFAULT_SQL_CONNECTION,
-                         sqlite_db='ironic.sqlite')
     rpc.set_defaults(control_exchange='ironic')
     cfg.CONF(argv[1:],
              project='ironic',

ironic/db/sqlalchemy/api.py

@@ -23,12 +23,14 @@ from oslo.config import cfg
 from sqlalchemy.orm.exc import NoResultFound
 
 from ironic.common import exception
+from ironic.common import paths
 from ironic.common import states
 from ironic.common import utils
 from ironic.db import api
 from ironic.db.sqlalchemy import models
 from ironic import objects
 from ironic.openstack.common.db import exception as db_exc
+from ironic.openstack.common.db import options as db_options
 from ironic.openstack.common.db.sqlalchemy import session as db_session
 from ironic.openstack.common.db.sqlalchemy import utils as db_utils
 from ironic.openstack.common import log
@@ -44,6 +46,10 @@ CONF.import_opt('heartbeat_timeout',
 
 LOG = log.getLogger(__name__)
 
+_DEFAULT_SQL_CONNECTION = 'sqlite:///' + paths.state_path_def('ironic.sqlite')
+db_options.set_defaults(_DEFAULT_SQL_CONNECTION, 'ironic.sqlite')
+
+
 _FACADE = None