Merge "Move dbsync to the correct path"

ironic_inspector/cmd/dbsync.py

@@ -60,8 +60,8 @@ command_opt = cfg.SubCommandOpt('command',
 
 
 def _get_alembic_config():
-    return alembic_config.Config(os.path.join(os.path.dirname(__file__),
-                                 'alembic.ini'))
+    base_path = os.path.split(os.path.dirname(__file__))[0]
+    return alembic_config.Config(os.path.join(base_path, 'alembic.ini'))
 
 
 def do_revision(config, cmd, *args, **kwargs):

ironic_inspector/test/functional.py

@@ -34,10 +34,10 @@ import six
 from six.moves import urllib
 
 from ironic_inspector.cmd import all as inspector_cmd
+from ironic_inspector.cmd import dbsync
 from ironic_inspector.common import ironic as ir_utils
 from ironic_inspector.common import swift
 from ironic_inspector import db
-from ironic_inspector import dbsync
 from ironic_inspector import introspection_state as istate
 from ironic_inspector import main
 from ironic_inspector import node_cache

ironic_inspector/test/unit/test_migrations.py

@@ -39,8 +39,8 @@ from oslo_log import log as logging
 from oslo_utils import uuidutils
 import sqlalchemy
 
+from ironic_inspector.cmd import dbsync
 from ironic_inspector import db
-from ironic_inspector import dbsync
 from ironic_inspector import introspection_state as istate
 from ironic_inspector.test import base
 

setup.cfg

@@ -27,7 +27,7 @@ packages =
 [entry_points]
 console_scripts =
     ironic-inspector = ironic_inspector.cmd.all:main
-    ironic-inspector-dbsync = ironic_inspector.dbsync:main
+    ironic-inspector-dbsync = ironic_inspector.cmd.dbsync:main
     ironic-inspector-rootwrap = oslo_rootwrap.cmd:main
     ironic-inspector-migrate-data = ironic_inspector.cmd.migration:main
 ironic_inspector.hooks.processing =