Revision d3ed23ff

b/lib/cli.py
56 56
  "NOHDR_OPT",
57 57
  "NONICS_OPT",
58 58
  "NWSYNC_OPT",
59
  "OS_OPT",
59 60
  "SEP_OPT",
60 61
  "SUBMIT_OPT",
61 62
  "SYNC_OPT",
......
506 507
                            default=None, type="string",
507 508
                            completion_suggest=OPT_COMPL_ONE_IALLOCATOR)
508 509

  
510
OS_OPT = cli_option("-o", "--os-type", dest="os", help="What OS to run",
511
                    metavar="<os>",
512
                    completion_suggest=OPT_COMPL_ONE_OS)
513

  
509 514

  
510 515
def _ParseArgs(argv, commands, aliases):
511 516
  """Parser for the command line arguments.
b/scripts/gnt-debug
200 200
                            help="Comma separated list of nics, each nic"
201 201
                            " definition is of form mac/ip/bridge, if"
202 202
                            " missing values are replace by None"),
203
                 cli_option("-o", "--os-type", default=None,
204
                            help="Select os for the instance",
205
                            completion_suggest=OPT_COMPL_ONE_OS),
203
                 OS_OPT,
206 204
                 cli_option("-p", "--vcpus", default=1, type="int",
207 205
                            help="Select number of VCPUs for the instance"),
208 206
                 cli_option("--tags", default=None,
b/scripts/gnt-instance
1333 1333
                      metavar="<node>",
1334 1334
                      completion_suggest=OPT_COMPL_ONE_NODE)
1335 1335

  
1336
os_opt = cli_option("-o", "--os-type", dest="os", help="What OS to run",
1337
                    metavar="<os>",
1338
                    completion_suggest=OPT_COMPL_ONE_OS)
1339

  
1340 1336
# multi-instance selection options
1341 1337
m_force_multi = cli_option("--force-multiple", dest="force_multi",
1342 1338
                           help="Do not ask for confirmation when more than"
......
1371 1367
             help="Target node and optional secondary node",
1372 1368
             metavar="<pnode>[:<snode>]",
1373 1369
             completion_suggest=OPT_COMPL_INST_ADD_NODES),
1374
  os_opt,
1370
  OS_OPT,
1375 1371
  cli_option("-B", "--backend", dest="beparams",
1376 1372
             type="keyval", default={},
1377 1373
             help="Backend parameters"),
......
1485 1481
           " list is (in order): %s." % ", ".join(_LIST_DEF_FIELDS),
1486 1482
           ),
1487 1483
  'reinstall': (ReinstallInstance, [ArgInstance(min=1)],
1488
                [DEBUG_OPT, FORCE_OPT, os_opt,
1484
                [DEBUG_OPT, FORCE_OPT, OS_OPT,
1489 1485
                 m_force_multi,
1490 1486
                 m_node_opt, m_pri_node_opt, m_sec_node_opt,
1491 1487
                 m_clust_opt, m_inst_opt,

Also available in: Unified diff