openstack/trove
Code Issues Proposed changes

Merge "rename and fix the db_wipe command"

Browse Source
This commit is contained in:
Jenkins 2014-03-11 08:37:56 +00:00 committed by Gerrit Code Review
commit 8a443dab5b
3 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
doc/source/dev/manual_install.rst
View File

@ -212,7 +212,7 @@ Prepare database
---------------- ----------------
* Initialize the database:: * Initialize the database::
# trove-manage --config-file=<PathToTroveConf> db_wipe trove_test.sqlite mysql fake # trove-manage --config-file=<PathToTroveConf> db_recreate trove_test.sqlite mysql fake
* Setup trove to use the uploaded image. Enter the following in a single line, note quotes (') and backquotes(`):: * Setup trove to use the uploaded image. Enter the following in a single line, note quotes (') and backquotes(`)::

2
tools/start-fake-mode.sh
View File

@ -10,7 +10,7 @@ function run() {
.tox/py26/bin/python $@ .tox/py26/bin/python $@
} }
run bin/trove-manage \ run bin/trove-manage \
--config-file=etc/trove/trove.conf.test db_wipe \ --config-file=etc/trove/trove.conf.test db_recreate \
trove_test.sqlite mysql fake trove_test.sqlite mysql fake
run bin/trove-fake-mode \ run bin/trove-fake-mode \
--fork --config-file=etc/trove/trove.conf.test \ --fork --config-file=etc/trove/trove.conf.test \

10
trove/cmd/manage.py
View File

@ -77,10 +77,10 @@ class Commands(object):
except exception.DatastoreNotFound as e: except exception.DatastoreNotFound as e:
print(e) print(e)
def db_wipe(self, repo_path): def db_recreate(self, repo_path):
"""Drops the database and recreates it.""" """Drops the database and recreates it."""
self.db_api.drop_db(CONF) self.db_api.drop_db(CONF)
self.db_sync() self.db_sync(repo_path)
def params_of(self, command_name): def params_of(self, command_name):
if Commands.has(command_name): if Commands.has(command_name):
@ -113,7 +113,11 @@ def main():
parser.add_argument('packages') parser.add_argument('packages')
parser.add_argument('active') parser.add_argument('active')
parser = subparser.add_parser('db_wipe') parser = subparser.add_parser(
'db_recreate', description='Drop the database and recreate it')
parser.add_argument(
'--repo_path', help='SQLAlchemy Migrate repository path')
parser = subparser.add_parser('db_recreate')
parser.add_argument('repo_path') parser.add_argument('repo_path')
cfg.custom_parser('action', actions) cfg.custom_parser('action', actions)