Revision d6cd74dd

b/lib/cli.py
165 165
  "PREALLOC_WIPE_DISKS_OPT",
166 166
  "PRIMARY_IP_VERSION_OPT",
167 167
  "PRIMARY_ONLY_OPT",
168
  "PRINT_JOBID_OPT",
168 169
  "PRIORITY_OPT",
169 170
  "RAPI_CERT_OPT",
170 171
  "READD_OPT",
......
198 199
  "SRC_DIR_OPT",
199 200
  "SRC_NODE_OPT",
200 201
  "SUBMIT_OPT",
202
  "SUBMIT_OPTS",
201 203
  "STARTUP_PAUSED_OPT",
202 204
  "STATIC_OPT",
203 205
  "SYNC_OPT",
......
832 834
                        help=("Submit the job and return the job ID, but"
833 835
                              " don't wait for the job to finish"))
834 836

  
837
PRINT_JOBID_OPT = cli_option("--print-jobid", dest="print_jobid",
838
                             default=False, action="store_true",
839
                             help=("Additionally print the job as first line"
840
                                   " on stdout (for scripting)."))
841

  
835 842
SYNC_OPT = cli_option("--sync", dest="do_locking",
836 843
                      default=False, action="store_true",
837 844
                      help=("Grab locks while doing the queries"
......
1634 1641
#: Options provided by all commands
1635 1642
COMMON_OPTS = [DEBUG_OPT, REASON_OPT]
1636 1643

  
1644
# options related to asynchronous job handling
1645

  
1646
SUBMIT_OPTS = [
1647
  SUBMIT_OPT,
1648
  PRINT_JOBID_OPT,
1649
  ]
1650

  
1637 1651
# common options for creating instances. add and import then add their own
1638 1652
# specific ones.
1639 1653
COMMON_CREATE_OPTS = [
......
1654 1668
  OSPARAMS_OPT,
1655 1669
  OS_SIZE_OPT,
1656 1670
  SUBMIT_OPT,
1671
  PRINT_JOBID_OPT,
1657 1672
  TAG_ADD_OPT,
1658 1673
  DRY_RUN_OPT,
1659 1674
  PRIORITY_OPT,
......
2248 2263
  SetGenericOpcodeOpts([op], opts)
2249 2264

  
2250 2265
  job_id = SendJob([op], cl=cl)
2266
  if opts.print_jobid:
2267
    ToStdout("%d" % job_id)
2251 2268

  
2252 2269
  op_results = PollJob(job_id, cl=cl, feedback_fn=feedback_fn,
2253 2270
                       reporter=reporter)
......
2271 2288
    job = [op]
2272 2289
    SetGenericOpcodeOpts(job, opts)
2273 2290
    job_id = SendJob(job, cl=cl)
2291
    if opts.print_jobid:
2292
      ToStdout("%d" % job_id)
2274 2293
    raise JobSubmittedException(job_id)
2275 2294
  else:
2276 2295
    return SubmitOpCode(op, cl=cl, feedback_fn=feedback_fn, opts=opts)
b/lib/client/gnt_backup.py
150 150
    ExportInstance, ARGS_ONE_INSTANCE,
151 151
    [FORCE_OPT, SINGLE_NODE_OPT, NOSHUTDOWN_OPT, SHUTDOWN_TIMEOUT_OPT,
152 152
     REMOVE_INSTANCE_OPT, IGNORE_REMOVE_FAILURES_OPT, DRY_RUN_OPT,
153
     PRIORITY_OPT, SUBMIT_OPT],
153
     PRIORITY_OPT] + SUBMIT_OPTS,
154 154
    "-n <target_node> [opts...] <name>",
155 155
    "Exports an instance to an image"),
156 156
  "import": (
......
159 159
    "Imports an instance from an exported image"),
160 160
  "remove": (
161 161
    RemoveExport, [ArgUnknown(min=1, max=1)],
162
    [DRY_RUN_OPT, PRIORITY_OPT, SUBMIT_OPT],
162
    [DRY_RUN_OPT, PRIORITY_OPT] + SUBMIT_OPTS,
163 163
    "<name>", "Remove exports of named instance from the filesystem."),
164 164
  }
165 165

  
b/lib/client/gnt_cluster.py
1550 1550
    "<new_name>",
1551 1551
    "Renames the cluster"),
1552 1552
  "redist-conf": (
1553
    RedistributeConfig, ARGS_NONE, [SUBMIT_OPT, DRY_RUN_OPT, PRIORITY_OPT],
1553
    RedistributeConfig, ARGS_NONE, SUBMIT_OPTS + [DRY_RUN_OPT, PRIORITY_OPT],
1554 1554
    "", "Forces a push of the configuration file and ssconf files"
1555 1555
    " to the nodes in the cluster"),
1556 1556
  "verify": (
......
1590 1590
  "list-tags": (
1591 1591
    ListTags, ARGS_NONE, [], "", "List the tags of the cluster"),
1592 1592
  "add-tags": (
1593
    AddTags, [ArgUnknown()], [TAG_SRC_OPT, PRIORITY_OPT, SUBMIT_OPT],
1593
    AddTags, [ArgUnknown()], [TAG_SRC_OPT, PRIORITY_OPT] + SUBMIT_OPTS,
1594 1594
    "tag...", "Add tags to the cluster"),
1595 1595
  "remove-tags": (
1596
    RemoveTags, [ArgUnknown()], [TAG_SRC_OPT, PRIORITY_OPT, SUBMIT_OPT],
1596
    RemoveTags, [ArgUnknown()], [TAG_SRC_OPT, PRIORITY_OPT] + SUBMIT_OPTS,
1597 1597
    "tag...", "Remove tags from the cluster"),
1598 1598
  "search-tags": (
1599 1599
    SearchTags, [ArgUnknown(min=1, max=1)], [PRIORITY_OPT], "",
......
1617 1617
     DRBD_HELPER_OPT, NODRBD_STORAGE_OPT, DEFAULT_IALLOCATOR_OPT,
1618 1618
     RESERVED_LVS_OPT, DRY_RUN_OPT, PRIORITY_OPT, PREALLOC_WIPE_DISKS_OPT,
1619 1619
     NODE_PARAMS_OPT, USE_EXTERNAL_MIP_SCRIPT, DISK_PARAMS_OPT, HV_STATE_OPT,
1620
     DISK_STATE_OPT, SUBMIT_OPT, ENABLED_DISK_TEMPLATES_OPT,
1621
     IPOLICY_STD_SPECS_OPT] + INSTANCE_POLICY_OPTS,
1620
     DISK_STATE_OPT] + SUBMIT_OPTS +
1621
    [ENABLED_DISK_TEMPLATES_OPT, IPOLICY_STD_SPECS_OPT] + INSTANCE_POLICY_OPTS,
1622 1622
    "[opts...]",
1623 1623
    "Alters the parameters of the cluster"),
1624 1624
  "renew-crypto": (
b/lib/client/gnt_debug.py
631 631
                action="append", help="Select nodes to sleep on"),
632 632
     cli_option("-r", "--repeat", type="int", default="0", dest="repeat",
633 633
                help="Number of times to repeat the sleep"),
634
     DRY_RUN_OPT, PRIORITY_OPT, SUBMIT_OPT,
635
     ],
634
     DRY_RUN_OPT, PRIORITY_OPT] + SUBMIT_OPTS,
636 635
    "[opts...] <duration>", "Executes a TestDelay OpCode"),
637 636
  "submit-job": (
638 637
    GenericOpCodes, [ArgFile(min=1)],
b/lib/client/gnt_group.py
323 323
  "add": (
324 324
    AddGroup, ARGS_ONE_GROUP,
325 325
    [DRY_RUN_OPT, ALLOC_POLICY_OPT, NODE_PARAMS_OPT, DISK_PARAMS_OPT,
326
     HV_STATE_OPT, DISK_STATE_OPT, PRIORITY_OPT,
327
     SUBMIT_OPT] + INSTANCE_POLICY_OPTS,
326
     HV_STATE_OPT, DISK_STATE_OPT, PRIORITY_OPT]
327
    + SUBMIT_OPTS + INSTANCE_POLICY_OPTS,
328 328
    "<group_name>", "Add a new node group to the cluster"),
329 329
  "assign-nodes": (
330 330
    AssignNodes, ARGS_ONE_GROUP + ARGS_MANY_NODES,
331
    [DRY_RUN_OPT, FORCE_OPT, PRIORITY_OPT, SUBMIT_OPT],
331
    [DRY_RUN_OPT, FORCE_OPT, PRIORITY_OPT] + SUBMIT_OPTS,
332 332
    "<group_name> <node>...", "Assign nodes to a group"),
333 333
  "list": (
334 334
    ListGroups, ARGS_MANY_GROUPS,
......
342 342
    "Lists all available fields for node groups"),
343 343
  "modify": (
344 344
    SetGroupParams, ARGS_ONE_GROUP,
345
    [DRY_RUN_OPT, SUBMIT_OPT, ALLOC_POLICY_OPT, NODE_PARAMS_OPT, HV_STATE_OPT,
346
     DISK_STATE_OPT, DISK_PARAMS_OPT, PRIORITY_OPT] + INSTANCE_POLICY_OPTS,
345
    [DRY_RUN_OPT] + SUBMIT_OPTS + [ALLOC_POLICY_OPT, NODE_PARAMS_OPT,
346
    HV_STATE_OPT, DISK_STATE_OPT, DISK_PARAMS_OPT, PRIORITY_OPT]
347
    + INSTANCE_POLICY_OPTS,
347 348
    "<group_name>", "Alters the parameters of a node group"),
348 349
  "remove": (
349
    RemoveGroup, ARGS_ONE_GROUP, [DRY_RUN_OPT, PRIORITY_OPT, SUBMIT_OPT],
350
    RemoveGroup, ARGS_ONE_GROUP, [DRY_RUN_OPT, PRIORITY_OPT] + SUBMIT_OPTS,
350 351
    "[--dry-run] <group-name>",
351 352
    "Remove an (empty) node group from the cluster"),
352 353
  "rename": (
353 354
    RenameGroup, [ArgGroup(min=2, max=2)],
354
    [DRY_RUN_OPT, SUBMIT_OPT, PRIORITY_OPT],
355
    [DRY_RUN_OPT] + SUBMIT_OPTS + [PRIORITY_OPT],
355 356
    "[--dry-run] <group-name> <new-name>", "Rename a node group"),
356 357
  "evacuate": (
357 358
    EvacuateGroup, [ArgGroup(min=1, max=1)],
358
    [TO_GROUP_OPT, IALLOCATOR_OPT, EARLY_RELEASE_OPT, SUBMIT_OPT, PRIORITY_OPT],
359
    [TO_GROUP_OPT, IALLOCATOR_OPT, EARLY_RELEASE_OPT] + SUBMIT_OPTS,
359 360
    "[-I <iallocator>] [--to <group>]",
360 361
    "Evacuate all instances within a group"),
361 362
  "list-tags": (
......
363 364
    "<group_name>", "List the tags of the given group"),
364 365
  "add-tags": (
365 366
    AddTags, [ArgGroup(min=1, max=1), ArgUnknown()],
366
    [TAG_SRC_OPT, PRIORITY_OPT, SUBMIT_OPT],
367
    [TAG_SRC_OPT, PRIORITY_OPT] + SUBMIT_OPTS,
367 368
    "<group_name> tag...", "Add tags to the given group"),
368 369
  "remove-tags": (
369 370
    RemoveTags, [ArgGroup(min=1, max=1), ArgUnknown()],
370
    [TAG_SRC_OPT, PRIORITY_OPT, SUBMIT_OPT],
371
    [TAG_SRC_OPT, PRIORITY_OPT] + SUBMIT_OPTS,
371 372
    "<group_name> tag...", "Remove tags from the given group"),
372 373
  "info": (
373 374
    GroupInfo, ARGS_MANY_GROUPS, [], "[<group_name>...]",
b/lib/client/gnt_instance.py
1458 1458
    "Creates and adds a new instance to the cluster"),
1459 1459
  "batch-create": (
1460 1460
    BatchCreate, [ArgFile(min=1, max=1)],
1461
    [DRY_RUN_OPT, PRIORITY_OPT, IALLOCATOR_OPT, SUBMIT_OPT],
1461
    [DRY_RUN_OPT, PRIORITY_OPT, IALLOCATOR_OPT] + SUBMIT_OPTS,
1462 1462
    "<instances.json>",
1463 1463
    "Create a bunch of instances based on specs in the file."),
1464 1464
  "console": (
......
1467 1467
    "[--show-cmd] <instance>", "Opens a console on the specified instance"),
1468 1468
  "failover": (
1469 1469
    FailoverInstance, ARGS_ONE_INSTANCE,
1470
    [FORCE_OPT, IGNORE_CONSIST_OPT, SUBMIT_OPT, SHUTDOWN_TIMEOUT_OPT,
1470
    [FORCE_OPT, IGNORE_CONSIST_OPT] + SUBMIT_OPTS +
1471
    [SHUTDOWN_TIMEOUT_OPT,
1471 1472
     DRY_RUN_OPT, PRIORITY_OPT, DST_NODE_OPT, IALLOCATOR_OPT,
1472 1473
     IGNORE_IPOLICY_OPT],
1473 1474
    "[-f] <instance>", "Stops the instance, changes its primary node and"
......
1478 1479
    MigrateInstance, ARGS_ONE_INSTANCE,
1479 1480
    [FORCE_OPT, NONLIVE_OPT, MIGRATION_MODE_OPT, CLEANUP_OPT, DRY_RUN_OPT,
1480 1481
     PRIORITY_OPT, DST_NODE_OPT, IALLOCATOR_OPT, ALLOW_FAILOVER_OPT,
1481
     IGNORE_IPOLICY_OPT, NORUNTIME_CHGS_OPT, SUBMIT_OPT],
1482
     IGNORE_IPOLICY_OPT, NORUNTIME_CHGS_OPT] + SUBMIT_OPTS,
1482 1483
    "[-f] <instance>", "Migrate instance to its secondary node"
1483 1484
    " (only for mirrored instances)"),
1484 1485
  "move": (
1485 1486
    MoveInstance, ARGS_ONE_INSTANCE,
1486
    [FORCE_OPT, SUBMIT_OPT, SINGLE_NODE_OPT, SHUTDOWN_TIMEOUT_OPT,
1487
     DRY_RUN_OPT, PRIORITY_OPT, IGNORE_CONSIST_OPT, IGNORE_IPOLICY_OPT],
1487
    [FORCE_OPT] + SUBMIT_OPTS +
1488
    [SINGLE_NODE_OPT,
1489
     SHUTDOWN_TIMEOUT_OPT, DRY_RUN_OPT, PRIORITY_OPT, IGNORE_CONSIST_OPT,
1490
     IGNORE_IPOLICY_OPT],
1488 1491
    "[-f] <instance>", "Move instance to an arbitrary node"
1489 1492
    " (only for instances of type file and lv)"),
1490 1493
  "info": (
......
1511 1514
    ReinstallInstance, [ArgInstance()],
1512 1515
    [FORCE_OPT, OS_OPT, FORCE_VARIANT_OPT, m_force_multi, m_node_opt,
1513 1516
     m_pri_node_opt, m_sec_node_opt, m_clust_opt, m_inst_opt, m_node_tags_opt,
1514
     m_pri_node_tags_opt, m_sec_node_tags_opt, m_inst_tags_opt, SELECT_OS_OPT,
1515
     SUBMIT_OPT, DRY_RUN_OPT, PRIORITY_OPT, OSPARAMS_OPT],
1517
     m_pri_node_tags_opt, m_sec_node_tags_opt, m_inst_tags_opt, SELECT_OS_OPT]
1518
    + SUBMIT_OPTS + [DRY_RUN_OPT, PRIORITY_OPT, OSPARAMS_OPT],
1516 1519
    "[-f] <instance>", "Reinstall a stopped instance"),
1517 1520
  "remove": (
1518 1521
    RemoveInstance, ARGS_ONE_INSTANCE,
1519
    [FORCE_OPT, SHUTDOWN_TIMEOUT_OPT, IGNORE_FAILURES_OPT, SUBMIT_OPT,
1520
     DRY_RUN_OPT, PRIORITY_OPT],
1522
    [FORCE_OPT, SHUTDOWN_TIMEOUT_OPT, IGNORE_FAILURES_OPT] + SUBMIT_OPTS
1523
    + [DRY_RUN_OPT, PRIORITY_OPT],
1521 1524
    "[-f] <instance>", "Shuts down the instance and removes it"),
1522 1525
  "rename": (
1523 1526
    RenameInstance,
1524 1527
    [ArgInstance(min=1, max=1), ArgHost(min=1, max=1)],
1525
    [NOIPCHECK_OPT, NONAMECHECK_OPT, SUBMIT_OPT, DRY_RUN_OPT, PRIORITY_OPT],
1528
    [NOIPCHECK_OPT, NONAMECHECK_OPT] + SUBMIT_OPTS
1529
    + [DRY_RUN_OPT, PRIORITY_OPT],
1526 1530
    "<instance> <new_name>", "Rename the instance"),
1527 1531
  "replace-disks": (
1528 1532
    ReplaceDisks, ARGS_ONE_INSTANCE,
1529 1533
    [AUTO_REPLACE_OPT, DISKIDX_OPT, IALLOCATOR_OPT, EARLY_RELEASE_OPT,
1530
     NEW_SECONDARY_OPT, ON_PRIMARY_OPT, ON_SECONDARY_OPT, SUBMIT_OPT,
1531
     DRY_RUN_OPT, PRIORITY_OPT, IGNORE_IPOLICY_OPT],
1534
     NEW_SECONDARY_OPT, ON_PRIMARY_OPT, ON_SECONDARY_OPT] + SUBMIT_OPTS
1535
    + [DRY_RUN_OPT, PRIORITY_OPT, IGNORE_IPOLICY_OPT],
1532 1536
    "[-s|-p|-a|-n NODE|-I NAME] <instance>",
1533 1537
    "Replaces disks for the instance"),
1534 1538
  "modify": (
1535 1539
    SetInstanceParams, ARGS_ONE_INSTANCE,
1536
    [BACKEND_OPT, DISK_OPT, FORCE_OPT, HVOPTS_OPT, NET_OPT, SUBMIT_OPT,
1537
     DISK_TEMPLATE_OPT, SINGLE_NODE_OPT, OS_OPT, FORCE_VARIANT_OPT,
1540
    [BACKEND_OPT, DISK_OPT, FORCE_OPT, HVOPTS_OPT, NET_OPT] + SUBMIT_OPTS +
1541
    [DISK_TEMPLATE_OPT, SINGLE_NODE_OPT, OS_OPT, FORCE_VARIANT_OPT,
1538 1542
     OSPARAMS_OPT, DRY_RUN_OPT, PRIORITY_OPT, NWSYNC_OPT, OFFLINE_INST_OPT,
1539 1543
     ONLINE_INST_OPT, IGNORE_IPOLICY_OPT, RUNTIME_MEM_OPT,
1540 1544
     NOCONFLICTSCHECK_OPT, NEW_PRIMARY_OPT],
......
1543 1547
    GenericManyOps("shutdown", _ShutdownInstance), [ArgInstance()],
1544 1548
    [FORCE_OPT, m_node_opt, m_pri_node_opt, m_sec_node_opt, m_clust_opt,
1545 1549
     m_node_tags_opt, m_pri_node_tags_opt, m_sec_node_tags_opt,
1546
     m_inst_tags_opt, m_inst_opt, m_force_multi, TIMEOUT_OPT, SUBMIT_OPT,
1547
     DRY_RUN_OPT, PRIORITY_OPT, IGNORE_OFFLINE_OPT, NO_REMEMBER_OPT],
1550
     m_inst_tags_opt, m_inst_opt, m_force_multi, TIMEOUT_OPT] + SUBMIT_OPTS
1551
    + [DRY_RUN_OPT, PRIORITY_OPT, IGNORE_OFFLINE_OPT, NO_REMEMBER_OPT],
1548 1552
    "<instance>", "Stops an instance"),
1549 1553
  "startup": (
1550 1554
    GenericManyOps("startup", _StartupInstance), [ArgInstance()],
1551 1555
    [FORCE_OPT, m_force_multi, m_node_opt, m_pri_node_opt, m_sec_node_opt,
1552 1556
     m_node_tags_opt, m_pri_node_tags_opt, m_sec_node_tags_opt,
1553
     m_inst_tags_opt, m_clust_opt, m_inst_opt, SUBMIT_OPT, HVOPTS_OPT,
1557
     m_inst_tags_opt, m_clust_opt, m_inst_opt] + SUBMIT_OPTS +
1558
    [HVOPTS_OPT,
1554 1559
     BACKEND_OPT, DRY_RUN_OPT, PRIORITY_OPT, IGNORE_OFFLINE_OPT,
1555 1560
     NO_REMEMBER_OPT, STARTUP_PAUSED_OPT],
1556 1561
    "<instance>", "Starts an instance"),
1557 1562
  "reboot": (
1558 1563
    GenericManyOps("reboot", _RebootInstance), [ArgInstance()],
1559 1564
    [m_force_multi, REBOOT_TYPE_OPT, IGNORE_SECONDARIES_OPT, m_node_opt,
1560
     m_pri_node_opt, m_sec_node_opt, m_clust_opt, m_inst_opt, SUBMIT_OPT,
1561
     m_node_tags_opt, m_pri_node_tags_opt, m_sec_node_tags_opt,
1565
     m_pri_node_opt, m_sec_node_opt, m_clust_opt, m_inst_opt] + SUBMIT_OPTS +
1566
    [m_node_tags_opt, m_pri_node_tags_opt, m_sec_node_tags_opt,
1562 1567
     m_inst_tags_opt, SHUTDOWN_TIMEOUT_OPT, DRY_RUN_OPT, PRIORITY_OPT],
1563 1568
    "<instance>", "Reboots an instance"),
1564 1569
  "activate-disks": (
1565 1570
    ActivateDisks, ARGS_ONE_INSTANCE,
1566
    [SUBMIT_OPT, IGNORE_SIZE_OPT, PRIORITY_OPT, WFSYNC_OPT],
1571
    SUBMIT_OPTS + [IGNORE_SIZE_OPT, PRIORITY_OPT, WFSYNC_OPT],
1567 1572
    "<instance>", "Activate an instance's disks"),
1568 1573
  "deactivate-disks": (
1569 1574
    DeactivateDisks, ARGS_ONE_INSTANCE,
1570
    [FORCE_OPT, SUBMIT_OPT, DRY_RUN_OPT, PRIORITY_OPT],
1575
    [FORCE_OPT] + SUBMIT_OPTS + [DRY_RUN_OPT, PRIORITY_OPT],
1571 1576
    "[-f] <instance>", "Deactivate an instance's disks"),
1572 1577
  "recreate-disks": (
1573 1578
    RecreateDisks, ARGS_ONE_INSTANCE,
1574
    [SUBMIT_OPT, DISK_OPT, NODE_PLACEMENT_OPT, DRY_RUN_OPT, PRIORITY_OPT,
1579
    SUBMIT_OPTS +
1580
    [DISK_OPT, NODE_PLACEMENT_OPT, DRY_RUN_OPT, PRIORITY_OPT,
1575 1581
     IALLOCATOR_OPT],
1576 1582
    "<instance>", "Recreate an instance's disks"),
1577 1583
  "grow-disk": (
1578 1584
    GrowDisk,
1579 1585
    [ArgInstance(min=1, max=1), ArgUnknown(min=1, max=1),
1580 1586
     ArgUnknown(min=1, max=1)],
1581
    [SUBMIT_OPT, NWSYNC_OPT, DRY_RUN_OPT, PRIORITY_OPT, ABSOLUTE_OPT],
1587
    SUBMIT_OPTS + [NWSYNC_OPT, DRY_RUN_OPT, PRIORITY_OPT, ABSOLUTE_OPT],
1582 1588
    "<instance> <disk> <size>", "Grow an instance's disk"),
1583 1589
  "change-group": (
1584 1590
    ChangeGroup, ARGS_ONE_INSTANCE,
1585
    [TO_GROUP_OPT, IALLOCATOR_OPT, EARLY_RELEASE_OPT, PRIORITY_OPT, SUBMIT_OPT],
1591
    [TO_GROUP_OPT, IALLOCATOR_OPT, EARLY_RELEASE_OPT, PRIORITY_OPT]
1592
    + SUBMIT_OPTS,
1586 1593
    "[-I <iallocator>] [--to <group>]", "Change group of instance"),
1587 1594
  "list-tags": (
1588 1595
    ListTags, ARGS_ONE_INSTANCE, [],
1589 1596
    "<instance_name>", "List the tags of the given instance"),
1590 1597
  "add-tags": (
1591 1598
    AddTags, [ArgInstance(min=1, max=1), ArgUnknown()],
1592
    [TAG_SRC_OPT, PRIORITY_OPT, SUBMIT_OPT],
1599
    [TAG_SRC_OPT, PRIORITY_OPT] + SUBMIT_OPTS,
1593 1600
    "<instance_name> tag...", "Add tags to the given instance"),
1594 1601
  "remove-tags": (
1595 1602
    RemoveTags, [ArgInstance(min=1, max=1), ArgUnknown()],
1596
    [TAG_SRC_OPT, PRIORITY_OPT, SUBMIT_OPT],
1603
    [TAG_SRC_OPT, PRIORITY_OPT] + SUBMIT_OPTS,
1597 1604
    "<instance_name> tag...", "Remove tags from given instance"),
1598 1605
  }
1599 1606

  
b/lib/client/gnt_network.py
313 313
    AddNetwork, ARGS_ONE_NETWORK,
314 314
    [DRY_RUN_OPT, NETWORK_OPT, GATEWAY_OPT, ADD_RESERVED_IPS_OPT,
315 315
     MAC_PREFIX_OPT, NETWORK6_OPT, GATEWAY6_OPT,
316
     NOCONFLICTSCHECK_OPT, TAG_ADD_OPT, PRIORITY_OPT, SUBMIT_OPT],
316
     NOCONFLICTSCHECK_OPT, TAG_ADD_OPT, PRIORITY_OPT] + SUBMIT_OPTS,
317 317
    "<network_name>", "Add a new IP network to the cluster"),
318 318
  "list": (
319 319
    ListNetworks, ARGS_MANY_NETWORKS,
......
330 330
    "[<network_name>...]", "Show information about the network(s)"),
331 331
  "modify": (
332 332
    SetNetworkParams, ARGS_ONE_NETWORK,
333
    [DRY_RUN_OPT, SUBMIT_OPT, ADD_RESERVED_IPS_OPT, REMOVE_RESERVED_IPS_OPT,
334
     GATEWAY_OPT, MAC_PREFIX_OPT, NETWORK6_OPT, GATEWAY6_OPT,
335
     PRIORITY_OPT],
333
    [DRY_RUN_OPT] + SUBMIT_OPTS +
334
    [ADD_RESERVED_IPS_OPT,
335
     REMOVE_RESERVED_IPS_OPT, GATEWAY_OPT, MAC_PREFIX_OPT, NETWORK6_OPT,
336
     GATEWAY6_OPT, PRIORITY_OPT],
336 337
    "<network_name>", "Alters the parameters of a network"),
337 338
  "connect": (
338 339
    ConnectNetwork,
......
352 353
    "Unmap a given network from a specified node group"),
353 354
  "remove": (
354 355
    RemoveNetwork, ARGS_ONE_NETWORK,
355
    [FORCE_OPT, DRY_RUN_OPT, SUBMIT_OPT, PRIORITY_OPT],
356
    [FORCE_OPT, DRY_RUN_OPT] + SUBMIT_OPTS + [PRIORITY_OPT],
356 357
    "[--dry-run] <network_id>",
357 358
    "Remove an (empty) network from the cluster"),
358 359
  "list-tags": (
......
360 361
    "<network_name>", "List the tags of the given network"),
361 362
  "add-tags": (
362 363
    AddTags, [ArgNetwork(min=1, max=1), ArgUnknown()],
363
    [TAG_SRC_OPT, PRIORITY_OPT, SUBMIT_OPT],
364
    [TAG_SRC_OPT, PRIORITY_OPT] + SUBMIT_OPTS,
364 365
    "<network_name> tag...", "Add tags to the given network"),
365 366
  "remove-tags": (
366 367
    RemoveTags, [ArgNetwork(min=1, max=1), ArgUnknown()],
367
    [TAG_SRC_OPT, PRIORITY_OPT, SUBMIT_OPT],
368
    [TAG_SRC_OPT, PRIORITY_OPT] + SUBMIT_OPTS,
368 369
    "<network_name> tag...", "Remove tags from given network"),
369 370
}
370 371

  
b/lib/client/gnt_node.py
1090 1090
  "evacuate": (
1091 1091
    EvacuateNode, ARGS_ONE_NODE,
1092 1092
    [FORCE_OPT, IALLOCATOR_OPT, NEW_SECONDARY_OPT, EARLY_RELEASE_OPT,
1093
     PRIORITY_OPT, PRIMARY_ONLY_OPT, SECONDARY_ONLY_OPT, SUBMIT_OPT],
1093
     PRIORITY_OPT, PRIMARY_ONLY_OPT, SECONDARY_ONLY_OPT] + SUBMIT_OPTS,
1094 1094
    "[-f] {-I <iallocator> | -n <dst>} [-p | -s] [options...] <node>",
1095 1095
    "Relocate the primary and/or secondary instances from a node"),
1096 1096
  "failover": (
......
1103 1103
    MigrateNode, ARGS_ONE_NODE,
1104 1104
    [FORCE_OPT, NONLIVE_OPT, MIGRATION_MODE_OPT, DST_NODE_OPT,
1105 1105
     IALLOCATOR_OPT, PRIORITY_OPT, IGNORE_IPOLICY_OPT,
1106
     NORUNTIME_CHGS_OPT, SUBMIT_OPT],
1106
     NORUNTIME_CHGS_OPT] + SUBMIT_OPTS,
1107 1107
    "[-f] <node>",
1108 1108
    "Migrate all the primary instance on a node away from it"
1109 1109
    " (only for instances of type drbd)"),
......
1126 1126
    "Lists all available fields for nodes"),
1127 1127
  "modify": (
1128 1128
    SetNodeParams, ARGS_ONE_NODE,
1129
    [FORCE_OPT, SUBMIT_OPT, MC_OPT, DRAINED_OPT, OFFLINE_OPT,
1129
    [FORCE_OPT] + SUBMIT_OPTS +
1130
    [MC_OPT, DRAINED_OPT, OFFLINE_OPT,
1130 1131
     CAPAB_MASTER_OPT, CAPAB_VM_OPT, SECONDARY_IP_OPT,
1131 1132
     AUTO_PROMOTE_OPT, DRY_RUN_OPT, PRIORITY_OPT, NODE_PARAMS_OPT,
1132 1133
     NODE_POWERED_OPT, HV_STATE_OPT, DISK_STATE_OPT],
1133 1134
    "<node_name>", "Alters the parameters of a node"),
1134 1135
  "powercycle": (
1135 1136
    PowercycleNode, ARGS_ONE_NODE,
1136
    [FORCE_OPT, CONFIRM_OPT, DRY_RUN_OPT, PRIORITY_OPT, SUBMIT_OPT],
1137
    [FORCE_OPT, CONFIRM_OPT, DRY_RUN_OPT, PRIORITY_OPT] + SUBMIT_OPTS,
1137 1138
    "<node_name>", "Tries to forcefully powercycle a node"),
1138 1139
  "power": (
1139 1140
    PowerNode,
1140 1141
    [ArgChoice(min=1, max=1, choices=_LIST_POWER_COMMANDS),
1141 1142
     ArgNode()],
1142
    [SUBMIT_OPT, AUTO_PROMOTE_OPT, PRIORITY_OPT, IGNORE_STATUS_OPT,
1143
     FORCE_OPT, NOHDR_OPT, SEP_OPT, OOB_TIMEOUT_OPT, POWER_DELAY_OPT],
1143
    SUBMIT_OPTS +
1144
    [AUTO_PROMOTE_OPT, PRIORITY_OPT,
1145
     IGNORE_STATUS_OPT, FORCE_OPT, NOHDR_OPT, SEP_OPT, OOB_TIMEOUT_OPT,
1146
     POWER_DELAY_OPT],
1144 1147
    "on|off|cycle|status [nodes...]",
1145 1148
    "Change power state of node by calling out-of-band helper."),
1146 1149
  "remove": (
......
1162 1165
    [ArgNode(min=1, max=1),
1163 1166
     ArgChoice(min=1, max=1, choices=_MODIFIABLE_STORAGE_TYPES),
1164 1167
     ArgFile(min=1, max=1)],
1165
    [ALLOCATABLE_OPT, DRY_RUN_OPT, PRIORITY_OPT, SUBMIT_OPT],
1168
    [ALLOCATABLE_OPT, DRY_RUN_OPT, PRIORITY_OPT] + SUBMIT_OPTS,
1166 1169
    "<node_name> <storage_type> <name>", "Modify storage volume on a node"),
1167 1170
  "repair-storage": (
1168 1171
    RepairStorage,
1169 1172
    [ArgNode(min=1, max=1),
1170 1173
     ArgChoice(min=1, max=1, choices=_REPAIRABLE_STORAGE_TYPES),
1171 1174
     ArgFile(min=1, max=1)],
1172
    [IGNORE_CONSIST_OPT, DRY_RUN_OPT, PRIORITY_OPT, SUBMIT_OPT],
1175
    [IGNORE_CONSIST_OPT, DRY_RUN_OPT, PRIORITY_OPT] + SUBMIT_OPTS,
1173 1176
    "<node_name> <storage_type> <name>",
1174 1177
    "Repairs a storage volume on a node"),
1175 1178
  "list-tags": (
......
1177 1180
    "<node_name>", "List the tags of the given node"),
1178 1181
  "add-tags": (
1179 1182
    AddTags, [ArgNode(min=1, max=1), ArgUnknown()],
1180
    [TAG_SRC_OPT, PRIORITY_OPT, SUBMIT_OPT],
1183
    [TAG_SRC_OPT, PRIORITY_OPT] + SUBMIT_OPTS,
1181 1184
    "<node_name> tag...", "Add tags to the given node"),
1182 1185
  "remove-tags": (
1183 1186
    RemoveTags, [ArgNode(min=1, max=1), ArgUnknown()],
1184
    [TAG_SRC_OPT, PRIORITY_OPT, SUBMIT_OPT],
1187
    [TAG_SRC_OPT, PRIORITY_OPT] + SUBMIT_OPTS,
1185 1188
    "<node_name> tag...", "Remove tags from the given node"),
1186 1189
  "health": (
1187 1190
    Health, ARGS_MANY_NODES,
......
1193 1196
    "[<node_name>]", "Query the list of used DRBD minors on the given node"),
1194 1197
  "restricted-command": (
1195 1198
    RestrictedCommand, [ArgUnknown(min=1, max=1)] + ARGS_MANY_NODES,
1196
    [SYNC_OPT, PRIORITY_OPT, SUBMIT_OPT, SHOW_MACHINE_OPT, NODEGROUP_OPT],
1199
    [SYNC_OPT, PRIORITY_OPT] + SUBMIT_OPTS + [SHOW_MACHINE_OPT, NODEGROUP_OPT],
1197 1200
    "<command> <node_name> [<node_name>...]",
1198 1201
    "Executes a restricted command on node(s)"),
1199 1202
  }
b/lib/client/gnt_os.py
289 289
  "modify": (
290 290
    ModifyOS, ARGS_ONE_OS,
291 291
    [HVLIST_OPT, OSPARAMS_OPT, DRY_RUN_OPT, PRIORITY_OPT,
292
     HID_OS_OPT, BLK_OS_OPT, SUBMIT_OPT],
292
     HID_OS_OPT, BLK_OS_OPT] + SUBMIT_OPTS,
293 293
    "", "Modify the OS parameters"),
294 294
  }
295 295

  
b/man/ganeti.rst
240 240
command using the ``--help`` option.
241 241

  
242 242
| **gnt-...** *command* [\--dry-run] [\--priority {low | normal | high}]
243
| [\--submit]
243
| [\--submit] [\--print-job-id]
244 244

  
245 245
The ``--dry-run`` option can be used to check whether an operation
246 246
would succeed.
......
252 252
not wait for its completion. The job ID will be shown so that it can be
253 253
examined using **gnt-job info**.
254 254

  
255
The ``--print-job-id`` option makes the command print the job id as first
256
line on stdout, so that it is easy to parse by other programs.
257

  
255 258
Defaults
256 259
~~~~~~~~
257 260

  
b/man/gnt-backup.rst
26 26

  
27 27
| **export** {-n *node*} [\--shutdown-timeout=*N*] [\--noshutdown]
28 28
| [\--remove-instance] [\--ignore-remove-failures] [\--submit]
29
| [\--print-job-id]
29 30
| {*instance*}
30 31

  
31 32
Exports an instance to the target node. All the instance data and
......
75 76
| [-t [diskless | plain | drbd | file]]
76 77
| [\--identify-defaults]
77 78
| [\--ignore-ipolicy]
78
| [\--submit]
79
| [\--submit] [\--print-job-id]
79 80
| {*instance*}
80 81

  
81 82
Imports a new instance from an export residing on *source-node* in
b/man/gnt-cluster.rst
592 592
MODIFY
593 593
~~~~~~
594 594

  
595
| **modify** [\--submit]
595
| **modify** [\--submit] [\--print-job-id]
596 596
| [\--vg-name *vg-name*]
597 597
| [\--enabled-hypervisors *hypervisors*]
598 598
| [{-H|\--hypervisor-parameters} *hypervisor*:*hv-param*=*value*[,*hv-param*=*value*...]]
......
693 693
REDIST-CONF
694 694
~~~~~~~~~~~
695 695

  
696
**redist-conf** [\--submit]
696
**redist-conf** [\--submit] [\--print-job-id]
697 697

  
698 698
This command forces a full push of configuration files from the
699 699
master node to the other nodes in the cluster. This is normally not
b/man/gnt-group.rst
23 23
ADD
24 24
~~~
25 25

  
26
| **add** [\--submit]
26
| **add** [\--submit] [\--print-job-id]
27 27
| [\--node-parameters=*NDPARAMS*]
28 28
| [\--alloc-policy=*POLICY*]
29 29
| [{-D|\--disk-parameters} *disk-template*:*disk-param*=*value*[,*disk-param*=*value*...]]
......
75 75
~~~~~~~~~~~~
76 76

  
77 77
| **assign-nodes**
78
| [\--force] [\--submit]
78
| [\--force] [\--submit] [\--print-job-id]
79 79
| {*group*} {*node*...}
80 80

  
81 81
Assigns one or more nodes to the specified group, moving them from their
......
93 93
MODIFY
94 94
~~~~~~
95 95

  
96
| **modify** [\--submit]
96
| **modify** [\--submit] [\--print-job-id]
97 97
| [\--node-parameters=*NDPARAMS*]
98 98
| [\--alloc-policy=*POLICY*]
99 99
| [\--hypervisor-state *hvstate*]
......
124 124
REMOVE
125 125
~~~~~~
126 126

  
127
| **remove** [\--submit] {*group*}
127
| **remove** [\--submit] [\--print-job-id] {*group*}
128 128

  
129 129
Deletes the indicated node group, which must be empty. There must always be at
130 130
least one group, so the last group cannot be removed.
......
176 176
RENAME
177 177
~~~~~~
178 178

  
179
| **rename** [\--submit] {*oldname*} {*newname*}
179
| **rename** [\--submit] [\--print-job-id] {*oldname*} {*newname*}
180 180

  
181 181
Renames a given group from *oldname* to *newname*.
182 182

  
......
187 187
EVACUATE
188 188
~~~~~~~~
189 189

  
190
**evacuate** [\--submit] [\--iallocator *NAME*] [\--to *GROUP*...] {*group*}
190
| **evacuate** [\--submit] [\--print-job-id]
191
| [\--iallocator *NAME*] [\--to *GROUP*...] {*group*}
191 192

  
192 193
This command will move all instances out of the given node group.
193 194
Instances are placed in a new group by an iallocator, either given on
b/man/gnt-instance.rst
40 40
| [\--file-storage-dir *dir\_path*] [\--file-driver {loop \| blktap}]
41 41
| {{-n|\--node} *node[:secondary-node]* \| {-I|\--iallocator} *name*}
42 42
| {{-o|\--os-type} *os-type*}
43
| [\--submit]
43
| [\--submit] [\--print-job-id]
44 44
| [\--ignore-ipolicy]
45 45
| {*instance*}
46 46

  
......
945 945
REMOVE
946 946
^^^^^^
947 947

  
948
**remove** [\--ignore-failures] [\--shutdown-timeout=*N*] [\--submit]
949
[\--force] {*instance*}
948
| **remove** [\--ignore-failures] [\--shutdown-timeout=*N*] [\--submit]
949
| [\--print-job-id] [\--force] {*instance*}
950 950

  
951 951
Remove an instance. This will remove all data from the instance and
952 952
there is *no way back*. If you are not sure if you use an instance
......
1076 1076
| [\--os-type=*OS* [\--force-variant]]
1077 1077
| [{-O|\--os-parameters} *param*=*value*... ]
1078 1078
| [\--offline \| \--online]
1079
| [\--submit]
1079
| [\--submit] [\--print-job-id]
1080 1080
| [\--ignore-ipolicy]
1081 1081
| {*instance*}
1082 1082

  
......
1165 1165
| **reinstall** [{-o|\--os-type} *os-type*] [\--select-os] [-f *force*]
1166 1166
| [\--force-multiple]
1167 1167
| [\--instance \| \--node \| \--primary \| \--secondary \| \--all]
1168
| [{-O|\--os-parameters} *OS\_PARAMETERS*] [\--submit] {*instance*...}
1168
| [{-O|\--os-parameters} *OS\_PARAMETERS*] [\--submit] [\--print-job-id]
1169
| {*instance*...}
1169 1170

  
1170 1171
Reinstalls the operating system on the given instance(s). The
1171 1172
instance(s) must be stopped when running this command. If the ``-o
......
1190 1191
RENAME
1191 1192
^^^^^^
1192 1193

  
1193
| **rename** [\--no-ip-check] [\--no-name-check] [\--submit]
1194
| **rename** [\--no-ip-check] [\--no-name-check] [\--submit] [\--print-job-id]
1194 1195
| {*instance*} {*new\_name*}
1195 1196

  
1196 1197
Renames the given instance. The instance must be stopped when running
......
1226 1227
| \--tags \| \--node-tags \| \--pri-node-tags \| \--sec-node-tags]
1227 1228
| [{-H|\--hypervisor-parameters} ``key=value...``]
1228 1229
| [{-B|\--backend-parameters} ``key=value...``]
1229
| [\--submit] [\--paused]
1230
| [\--submit] [\--print-job-id] [\--paused]
1230 1231
| {*name*...}
1231 1232

  
1232 1233
Starts one or more instances, depending on the following options.  The
......
1324 1325
| [\--force] [\--force-multiple] [\--ignore-offline] [\--no-remember]
1325 1326
| [\--instance \| \--node \| \--primary \| \--secondary \| \--all \|
1326 1327
| \--tags \| \--node-tags \| \--pri-node-tags \| \--sec-node-tags]
1327
| [\--submit]
1328
| [\--submit] [\--print-job-id]
1328 1329
| {*name*...}
1329 1330

  
1330 1331
Stops one or more instances. If the instance cannot be cleanly stopped
......
1378 1379
| [\--force-multiple]
1379 1380
| [\--instance \| \--node \| \--primary \| \--secondary \| \--all \|
1380 1381
| \--tags \| \--node-tags \| \--pri-node-tags \| \--sec-node-tags]
1381
| [\--submit]
1382
| [\--submit] [\--print-job-id]
1382 1383
| [*name*...]
1383 1384

  
1384 1385
Reboots one or more instances. The type of reboot depends on the value
......
1442 1443
REPLACE-DISKS
1443 1444
^^^^^^^^^^^^^
1444 1445

  
1445
**replace-disks** [\--submit] [\--early-release] [\--ignore-ipolicy] {-p}
1446
[\--disks *idx*] {*instance*}
1446
| **replace-disks** [\--submit] [\--print-job-id] [\--early-release]
1447
| [\--ignore-ipolicy] {-p} [\--disks *idx*] {*instance*}
1447 1448

  
1448
**replace-disks** [\--submit] [\--early-release] [\--ignore-ipolicy] {-s}
1449
[\--disks *idx*] {*instance*}
1449
| **replace-disks** [\--submit] [\--print-job-id] [\--early-release]
1450
| [\--ignore-ipolicy] {-s} [\--disks *idx*] {*instance*}
1450 1451

  
1451
**replace-disks** [\--submit] [\--early-release] [\--ignore-ipolicy]
1452
{{-I\|\--iallocator} *name* \| {{-n|\--new-secondary} *node* } {*instance*}
1452
| **replace-disks** [\--submit] [\--print-job-id] [\--early-release]
1453
| [\--ignore-ipolicy]
1454
| {{-I\|\--iallocator} *name* \| {{-n|\--new-secondary} *node* } {*instance*}
1453 1455

  
1454
**replace-disks** [\--submit] [\--early-release] [\--ignore-ipolicy]
1455
{-a\|\--auto} {*instance*}
1456
| **replace-disks** [\--submit] [\--print-job-id] [\--early-release]
1457
| [\--ignore-ipolicy] {-a\|\--auto} {*instance*}
1456 1458

  
1457 1459
This command is a generalized form for replacing disks. It is
1458 1460
currently only valid for the mirrored (DRBD) disk template.
......
1500 1502
ACTIVATE-DISKS
1501 1503
^^^^^^^^^^^^^^
1502 1504

  
1503
**activate-disks** [\--submit] [\--ignore-size] [\--wait-for-sync] {*instance*}
1505
| **activate-disks** [\--submit] [\--print-job-id] [\--ignore-size]
1506
| [\--wait-for-sync] {*instance*}
1504 1507

  
1505 1508
Activates the block devices of the given instance. If successful, the
1506 1509
command will show the location and name of the block devices::
......
1538 1541
DEACTIVATE-DISKS
1539 1542
^^^^^^^^^^^^^^^^
1540 1543

  
1541
**deactivate-disks** [-f] [\--submit] {*instance*}
1544
**deactivate-disks** [-f] [\--submit] [\--print-job-id] {*instance*}
1542 1545

  
1543 1546
De-activates the block devices of the given instance. Note that if you
1544 1547
run this command for an instance with a drbd disk template, while it
......
1559 1562
GROW-DISK
1560 1563
^^^^^^^^^
1561 1564

  
1562
| **grow-disk** [\--no-wait-for-sync] [\--submit] [\--absolute]
1565
| **grow-disk** [\--no-wait-for-sync] [\--submit] [\--print-job-id]
1566
| [\--absolute]
1563 1567
| {*instance*} {*disk*} {*amount*}
1564 1568

  
1565 1569
Grows an instance's disk. This is only possible for instances having a
......
1617 1621
RECREATE-DISKS
1618 1622
^^^^^^^^^^^^^^
1619 1623

  
1620
| **recreate-disks** [\--submit]
1624
| **recreate-disks** [\--submit] [\--print-job-id]
1621 1625
| [{-n node1:[node2] \| {-I\|\--iallocator *name*}}]
1622 1626
| [\--disk=*N*[:[size=*VAL*][,spindles=*VAL*][,mode=*ro\|rw*]]] {*instance*}
1623 1627

  
......
1661 1665
| **failover** [-f] [\--ignore-consistency] [\--ignore-ipolicy]
1662 1666
| [\--shutdown-timeout=*N*]
1663 1667
| [{-n|\--target-node} *node* \| {-I|\--iallocator} *name*]
1664
| [\--submit]
1668
| [\--submit] [\--print-job-id]
1665 1669
| {*instance*}
1666 1670

  
1667 1671
Failover will stop the instance (if running), change its primary node,
......
1715 1719

  
1716 1720
| **migrate** [-f] [\--allow-failover] [\--non-live]
1717 1721
| [\--migration-mode=live\|non-live] [\--ignore-ipolicy]
1718
| [\--no-runtime-changes] [\--submit]
1722
| [\--no-runtime-changes] [\--submit] [\--print-job-id]
1719 1723
| [{-n|\--target-node} *node* \| {-I|\--iallocator} *name*] {*instance*}
1720 1724

  
1721
| **migrate** [-f] \--cleanup [\--submit] {*instance*}
1725
| **migrate** [-f] \--cleanup [\--submit] [\--print-job-id] {*instance*}
1722 1726

  
1723 1727
Migrate will move the instance to its secondary node without shutdown.
1724 1728
As with failover, it works for instances having the drbd disk template
......
1808 1812
^^^^
1809 1813

  
1810 1814
| **move** [-f] [\--ignore-consistency]
1811
| [-n *node*] [\--shutdown-timeout=*N*] [\--submit] [\--ignore-ipolicy]
1815
| [-n *node*] [\--shutdown-timeout=*N*] [\--submit] [\--print-job-id]
1816
| [\--ignore-ipolicy]
1812 1817
| {*instance*}
1813 1818

  
1814 1819
Move will move the instance to an arbitrary node in the cluster. This
......
1841 1846
CHANGE-GROUP
1842 1847
^^^^^^^^^^^^
1843 1848

  
1844
| **change-group** [\--submit]
1849
| **change-group** [\--submit] [\--print-job-id]
1845 1850
| [\--iallocator *NAME*] [\--to *GROUP*...] {*instance*}
1846 1851

  
1847 1852
This command moves an instance to another node group. The move is
b/man/gnt-network.rst
40 40
| [\--network6=*NETWORK6*]
41 41
| [\--gateway6=*GATEWAY6*]
42 42
| [\--mac-prefix=*MACPREFIX*]
43
| [\--submit]
43
| [\--submit] [\--print-job-id]
44 44
| {*network*}
45 45

  
46 46
Creates a new network with the given name. The network will be unused
......
76 76
| [\--network6=*NETWORK6*]
77 77
| [\--gateway6=*GATEWAY6*]
78 78
| [\--mac-prefix=*MACPREFIX*]
79
| [\--submit]
79
| [\--submit] [\--print-job-id]
80 80
| {*network*}
81 81

  
82 82
Modifies parameters from the network.
......
91 91
REMOVE
92 92
~~~~~~
93 93

  
94
| **remove** [\--submit] {*network*}
94
| **remove** [\--submit] [\--print-job-id] {*network*}
95 95

  
96 96
Deletes the indicated network, which must be not connected to any node group.
97 97

  
b/man/gnt-node.rst
81 81
EVACUATE
82 82
~~~~~~~~
83 83

  
84
| **evacuate** [-f] [\--early-release] [\--submit]
84
| **evacuate** [-f] [\--early-release] [\--submit] [\--print-job-id]
85 85
| [{-I|\--iallocator} *NAME* \| {-n|\--new-secondary} *destination\_node*]
86 86
| [{-p|\--primary-only} \| {-s|\--secondary-only} ]
87 87
|  {*node*}
......
264 264
~~~~~~~
265 265

  
266 266
| **migrate** [-f] [\--non-live] [\--migration-mode=live\|non-live]
267
| [\--ignore-ipolicy] [\--submit] {*node*}
267
| [\--ignore-ipolicy] [\--submit] [\--print-job-id] {*node*}
268 268

  
269 269
This command will migrate all instances having the given node as
270 270
primary to their secondary nodes. This works only for instances
......
288 288
MODIFY
289 289
~~~~~~
290 290

  
291
| **modify** [-f] [\--submit]
291
| **modify** [-f] [\--submit] [\--print-job-id]
292 292
| [{-C|\--master-candidate} ``yes|no``]
293 293
| [{-D|\--drained} ``yes|no``] [{-O|\--offline} ``yes|no``]
294 294
| [\--master-capable=``yes|no``] [\--vm-capable=``yes|no``] [\--auto-promote]
......
478 478
MODIFY-STORAGE
479 479
~~~~~~~~~~~~~~
480 480

  
481
| **modify-storage** [\--allocatable={yes|no}] [\--submit]
481
| **modify-storage** [\--allocatable={yes|no}] [\--submit] [\--print-job-id]
482 482
| {*node*} {*storage-type*} {*volume-name*}
483 483

  
484 484
Modifies storage volumes on a node. Only LVM physical volumes can
......
518 518
POWERCYCLE
519 519
~~~~~~~~~~
520 520

  
521
**powercycle** [\--yes] [\--force] [\--submit] {*node*}
521
**powercycle** [\--yes] [\--force] [\--submit] [\--print-job-id] {*node*}
522 522

  
523 523
This command (tries to) forcefully reboot a node. It is a command
524 524
that can be used if the node environment is broken, such that the
b/man/gnt-os.rst
56 56
MODIFY
57 57
~~~~~~
58 58

  
59
| **modify** [\--submit] [-H *HYPERVISOR*:option=*value*[,...]]
59
| **modify** [\--submit] [\--print-job-id]
60
| [-H *HYPERVISOR*:option=*value*[,...]]
60 61
| [\--hidden=*yes|no*] [\--blacklisted=*yes|no*]
61 62
| {*OS*}
62 63

  

Also available in: Unified diff