Revision f665d9de lib/client/gnt_instance.py

b/lib/client/gnt_instance.py
460 460

  
461 461
  op = opcodes.OpInstanceRemove(instance_name=instance_name,
462 462
                                ignore_failures=opts.ignore_failures,
463
                                shutdown_timeout=opts.shutdown_timeout)
463
                                shutdown_timeout=opts.shutdown_timeout,
464
                                keep_disks=opts.keep_disks)
464 465
  SubmitOrSend(op, opts, cl=cl)
465 466
  return 0
466 467

  
......
1375 1376
                                   disks=disks,
1376 1377
                                   hotplug=opts.hotplug,
1377 1378
                                   hotplug_if_possible=opts.hotplug_if_possible,
1379
                                   keep_disks=opts.keep_disks,
1378 1380
                                   disk_template=opts.disk_template,
1379 1381
                                   remote_node=opts.node,
1380 1382
                                   pnode=opts.new_primary_node,
......
1565 1567
  "remove": (
1566 1568
    RemoveInstance, ARGS_ONE_INSTANCE,
1567 1569
    [FORCE_OPT, SHUTDOWN_TIMEOUT_OPT, IGNORE_FAILURES_OPT] + SUBMIT_OPTS
1568
    + [DRY_RUN_OPT, PRIORITY_OPT],
1570
    + [DRY_RUN_OPT, PRIORITY_OPT, KEEPDISKS_OPT],
1569 1571
    "[-f] <instance>", "Shuts down the instance and removes it"),
1570 1572
  "rename": (
1571 1573
    RenameInstance,
......
1587 1589
     OSPARAMS_OPT, DRY_RUN_OPT, PRIORITY_OPT, NWSYNC_OPT, OFFLINE_INST_OPT,
1588 1590
     ONLINE_INST_OPT, IGNORE_IPOLICY_OPT, RUNTIME_MEM_OPT,
1589 1591
     NOCONFLICTSCHECK_OPT, NEW_PRIMARY_OPT, HOTPLUG_OPT,
1590
     HOTPLUG_IF_POSSIBLE_OPT],
1592
     HOTPLUG_IF_POSSIBLE_OPT, KEEPDISKS_OPT],
1591 1593
    "<instance>", "Alters the parameters of an instance"),
1592 1594
  "shutdown": (
1593 1595
    GenericManyOps("shutdown", _ShutdownInstance), [ArgInstance()],

Also available in: Unified diff