Merge "Moved required parameter for visibility"

heatclient/osc/v1/software_deployment.py

@@ -64,12 +64,6 @@ class CreateDeployment(format_utils.YamlFormat):
             metavar='<config>',
             help=_('ID of the configuration to deploy')
         )
-        parser.add_argument(
-            '--server',
-            metavar='<server>',
-            required=True,
-            help=_('ID of the server being deployed to')
-        )
         parser.add_argument(
             '--signal-transport',
             metavar='<signal-transport>',
@@ -96,6 +90,12 @@ class CreateDeployment(format_utils.YamlFormat):
             default=60,
             help=_('Deployment timeout in minutes')
         )
+        parser.add_argument(
+            '--server',
+            metavar='<server>',
+            required=True,
+            help=_('ID of the server being deployed to')
+        )
         return parser
 
     def take_action(self, parsed_args):

heatclient/osc/v1/stack.py

@@ -720,12 +720,6 @@ class AdoptStack(show.ShowOne):
             type=int,
             help=_('Stack creation timeout in minutes')
         )
-        parser.add_argument(
-            '--adopt-file',
-            metavar='<adopt-file>',
-            required=True,
-            help=_('Path to adopt stack data file')
-        )
         parser.add_argument(
             '--enable-rollback',
             action='store_true',
@@ -743,6 +737,12 @@ class AdoptStack(show.ShowOne):
             action='store_true',
             help=_('Wait until stack adopt completes')
         )
+        parser.add_argument(
+            '--adopt-file',
+            metavar='<adopt-file>',
+            required=True,
+            help=_('Path to adopt stack data file')
+        )
         return parser
 
     def take_action(self, parsed_args):

heatclient/osc/v1/template.py

@@ -87,12 +87,6 @@ class Validate(format_utils.YamlFormat):
 
     def get_parser(self, prog_name):
         parser = super(Validate, self).get_parser(prog_name)
-        parser.add_argument(
-            '-t', '--template',
-            metavar='<template>',
-            required=True,
-            help=_('Path to the template')
-        )
         parser.add_argument(
             '-e', '--environment',
             metavar='<environment>',
@@ -116,6 +110,12 @@ class Validate(format_utils.YamlFormat):
             metavar='<error1,error2,...>',
             help=_('List of heat errors to ignore')
         )
+        parser.add_argument(
+            '-t', '--template',
+            metavar='<template>',
+            required=True,
+            help=_('Path to the template')
+        )
         return parser
 
     def take_action(self, parsed_args):