openstack/ironic
Code Issues Proposed changes

Move mysql_engine option to [database] group

Browse Source 
We can not move the remaining db-related options to the [database] group
because they are defined in oslo-incubator.

sqlalchemy/models.py incorrectly sets options as default.
That's why we need to move mysql_engine to [database] group

Fixes: bug #1193499

Change-Id: Ic485fb28279e5ceeed6e21b4dee2a37a9eea6d6c
This commit is contained in:
jiangwt100 2013-07-01 01:00:22 +08:00
parent 1541b40456
commit 831a00fe7a
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
etc/ironic/ironic.conf.sample
View File

@ -78,14 +78,6 @@
#tempdir=<None>
#
# Options defined in ironic.db.sqlalchemy.models
#
# MySQL engine (string value)
#mysql_engine=InnoDB
#
# Options defined in ironic.drivers.modules.ipmi
#
@ -470,6 +462,14 @@
[database]
#
# Options defined in ironic.db.sqlalchemy.models
#
# MySQL engine (string value)
#mysql_engine=InnoDB
#
# Options defined in ironic.openstack.common.db.api
#

2
ironic/db/sqlalchemy/models.py
View File

@ -37,7 +37,7 @@ sql_opts = [
help='MySQL engine')
]
cfg.CONF.register_opts(sql_opts)
cfg.CONF.register_opts(sql_opts, 'database')
def table_args():