Merge "Sanitize newly added heat-manage command"

doc/source/man/heat-manage.rst

@@ -22,12 +22,8 @@ The standard pattern for executing a heat-manage command is:
 Run with -h to see a list of available commands:
 ``heat-manage -h``
 
-Commands are ``db_version``, ``db_sync``, ``purge_deleted`` and ``service``.
-Detailed descriptions are below.
-
-
-Heat Db version
-~~~~~~~~~~~~~~~
+Commands are ``db_version``, ``db_sync``, ``purge_deleted``, ``migrate_covergence_1``
+and ``service``. Detailed descriptions are below.
 
 ``heat-manage db_version``
 
@@ -42,6 +38,11 @@ Heat Db version
     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.
 
+``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``
 
     Shows details for all currently running heat-engines.

heat/cmd/manage.py

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