openstack
/
heat
Code Issues Proposed changes

Merge "Sanitize newly added heat-manage command"

This commit is contained in:
Jenkins 2017-01-04 11:04:32 +00:00 committed by Gerrit Code Review
parent 841492ea32 0a66b7750f
commit 1f7925d8e8
2 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
doc/source/man/heat-manage.rst
View File

@ -22,12 +22,8 @@ The standard pattern for executing a heat-manage command is:
Run with -h to see a list of available commands: Run with -h to see a list of available commands:
``heat-manage -h`` ``heat-manage -h``
Commands are ``db_version``, ``db_sync``, ``purge_deleted`` and ``service``. Commands are ``db_version``, ``db_sync``, ``purge_deleted``, ``migrate_covergence_1``
Detailed descriptions are below. and ``service``. Detailed descriptions are below.
Heat Db version
~~~~~~~~~~~~~~~
``heat-manage db_version`` ``heat-manage db_version``
@ -42,6 +38,11 @@ Heat Db version
Purge db entries marked as deleted and older than [age]. When project_id Purge db entries marked as deleted and older than [age]. When project_id
argument is provided, only entries belonging to this project will be purged. argument is provided, only entries belonging to this project will be purged.
``heat-manage migrate_convergence_1 [stack_id]``
Migrates [stack_id] from non-convergence to convergence. This requires running
convergence enabled heat engine(s) and can't be done when they are offline.
``heat-manage service list`` ``heat-manage service list``
Shows details for all currently running heat-engines. Shows details for all currently running heat-engines.

4
heat/cmd/manage.py
View File

@ -159,8 +159,8 @@ def add_command_parsers(subparsers):
# positional parameter, can be skipped. default=None # positional parameter, can be skipped. default=None
parser.add_argument('version', nargs='?') parser.add_argument('version', nargs='?')
# migrate-stacks parser # migrate_convergence_1 parser
parser = subparsers.add_parser('migrate-convergence-1') parser = subparsers.add_parser('migrate_convergence_1')
parser.set_defaults(func=do_migrate) parser.set_defaults(func=do_migrate)
parser.add_argument('stack_id') parser.add_argument('stack_id')