add a db_sync command to bin/ks, remove others

2 files changed, 8 insertions, 2 deletions

diff --git a/keystone/backends/sql/core.py b/keystone/backends/sql/core.py
index a9a95bbe..5bebf3af 100644
--- a/keystone/backends/sql/core.py
+++ b/keystone/backends/sql/core.py
@@ -12,6 +12,7 @@ import sqlalchemy.engine.url
 
 from keystone import config
 from keystone import models
+from keystone.backends.sql import migration
 
 
 CONF = config.CONF
@@ -198,6 +199,11 @@ class SqlBase(object):
 
 
 class SqlIdentity(SqlBase):
+  # Internal interface to manage the database
+  def db_sync(self):
+    migration.db_sync()
+
+  # Identity interface
   def authenticate(self, user_id=None, tenant_id=None, password=None):
     """Authenticate based on a user, tenant and password.
 
diff --git a/keystone/config.py b/keystone/config.py
index c2c7a924..796bb9b4 100644
--- a/keystone/config.py
+++ b/keystone/config.py
@@ -6,8 +6,8 @@ from keystone import cfg
 class Config(cfg.ConfigOpts):
   def __call__(self, config_files=None, *args, **kw):
     if config_files is not None:
-      self.config_file = config_files
-    super(Config, self).__call__(*args, **kw)
+      self._opts['config_file']['opt'].default = config_files
+    return super(Config, self).__call__(*args, **kw)
 
   def __getitem__(self, key, default=None):
     return getattr(self, key, default)