Remove --secondary-node option.

[ganeti-local] / scripts / gnt-instance

diff --git a/scripts/gnt-instance b/scripts/gnt-instance
index b101430..56b8662 100755 (executable)
--- a/scripts/gnt-instance
+++ b/scripts/gnt-instance
@@ -216,12 +216,14 @@ def AddInstance(opts, args):
   """
   instance = args[0]
 
+  (pnode, snode) = SplitNodeOption(opts.node)
+
   op = opcodes.OpCreateInstance(instance_name=instance, mem_size=opts.mem,
                                 disk_size=opts.size, swap_size=opts.swap,
                                 disk_template=opts.disk_template,
                                 mode=constants.INSTANCE_CREATE,
-                                os_type=opts.os, pnode=opts.node,
-                                snode=opts.snode, vcpus=opts.vcpus,
+                                os_type=opts.os, pnode=pnode,
+                                snode=snode, vcpus=opts.vcpus,
                                 ip=opts.ip, bridge=opts.bridge,
                                 start=opts.start, ip_check=opts.ip_check,
                                 wait_for_sync=opts.wait_for_sync)
@@ -674,7 +676,9 @@ m_inst_opt = make_option("--instance", dest="multi_mode",
 # this is defined separately due to readability only
 add_opts = [
   DEBUG_OPT,
-  node_opt,
+  make_option("-n", "--node", dest="node",
+              help="Target node and optional secondary node",
+              metavar="<pnode>[:<snode>]"),
   cli_option("-s", "--os-size", dest="size", help="Disk size, in MiB unless"
              " a suffix is used",
              default=20 * 1024, type="unit", metavar="<size>"),
@@ -694,9 +698,6 @@ add_opts = [
               default='none', type="string", metavar="<ADDRESS>"),
   make_option("--no-wait-for-sync", dest="wait_for_sync", default=True,
               action="store_false", help="Don't wait for sync (DANGEROUS!)"),
-  make_option("--secondary-node", dest="snode",
-              help="Secondary node for remote_raid1 disk layout",
-              metavar="<node>"),
   make_option("-b", "--bridge", dest="bridge",
               help="Bridge to connect this instance to",
               default=None, metavar="<bridge>"),