openstack
/
magnum
Code Issues Proposed changes

Fix missing sql_opts 

`tox -egenconfig` doesn't work, because
`magnum.db.sqlalchemy.models.sql_opts` is moved to
`magnum.db.sql_opts`.

This fixes it.

Change-Id: Ia617ee0ceae5bff7d745a9b48bfcdf9dfc00e336
Closes-Bug: #1490817
This commit is contained in:
OTSUKA, Yuanying 2015-09-01 13:51:40 +09:00
parent 4abd2f128b
commit 8e9e893cac
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
magnum/opts.py
View File

@ -26,7 +26,7 @@ import magnum.conductor.handlers.bay_conductor
import magnum.conductor.handlers.docker_conductor
import magnum.conductor.handlers.k8s_conductor
import magnum.conductor.template_definition
import magnum.db.sqlalchemy.models
import magnum.db
def list_opts():
@ -42,7 +42,7 @@ def list_opts():
('api', magnum.api.app.API_SERVICE_OPTS),
('bay', magnum.conductor.template_definition.template_def_opts),
('conductor', magnum.conductor.config.SERVICE_OPTS),
('database', magnum.db.sqlalchemy.models.sql_opts),
('database', magnum.db.sql_opts),
('docker', magnum.conductor.handlers.docker_conductor.docker_opts),
('magnum_client', magnum.common.clients.magnum_client_opts),
('heat_client', magnum.common.clients.heat_client_opts),