Revision a53a1b18

b/man/gnt-backup.sgml
92 92
      <title>IMPORT</title>
93 93
      <cmdsynopsis>
94 94
        <command>import</command>
95
        <arg choice="req">-n <replaceable>node<optional>:secondary-node</optional></replaceable></arg>
96
        <arg>-s <replaceable>disksize</replaceable></arg>
95

  
96
        <group choice="req">
97
          <arg>-n <replaceable>node<optional>:secondary-node</optional></replaceable></arg>
98
          <arg>--iallocator <replaceable>name</replaceable></arg>
99
        </group>
97 100
        <sbr>
98 101

  
102
        <arg>-s <replaceable>disksize</replaceable></arg>
99 103
        <arg>--swap-size <replaceable>disksize</replaceable></arg>
100 104
        <arg>-m <replaceable>memsize</replaceable></arg>
105
        <sbr>
106

  
101 107
        <arg>-b <replaceable>bridge</replaceable></arg>
108
        <arg choice="req">--src-node=<replaceable>source-node</replaceable></arg>
109
        <arg choice="req">--src-dir=<replaceable>source-dir</replaceable></arg>
102 110
        <sbr>
103 111

  
104 112
        <arg choice="req">-t<group>
......
108 116
          </group></arg>
109 117
        <sbr>
110 118

  
111
        <arg choice="req">--src-node=<replaceable>source-node</replaceable></arg>
112
        <arg choice="req">--src-dir=<replaceable>source-dir</replaceable></arg>
113 119
        <arg choice="req"><replaceable>instance</replaceable></arg>
114 120
      </cmdsynopsis>
115 121
      <para>
......
183 189
      </para>
184 190

  
185 191
      <para>
186
        The optional second value of the <option>--node</option> is
187
        used for the drbd disk template and specifies the remote node.
192
        The <option>--iallocator</option> option specifies the instance
193
        allocator plugin to use. If you pass in this option the allocator will
194
        select nodes for this instance automatically, so you don't need to pass
195
        them with the <option>-n</option> option. For more information please
196
        refer to the instance allocator documentation.
197
      </para>
198

  
199
      <para>
200
        The optional second value of the <option>--node</option> is used for
201
        the remote raid template type and specifies the remote node.
188 202
      </para>
189 203

  
190 204
      <para>
b/man/gnt-instance.sgml
2 2

  
3 3
  <!-- Fill in your name for FIRSTNAME and SURNAME. -->
4 4
  <!-- Please adjust the date whenever revising the manpage. -->
5
  <!ENTITY dhdate      "<date>May 16, 2007</date>">
5
  <!ENTITY dhdate      "<date>May 29, 2008</date>">
6 6
  <!-- SECTION should be 1-8, maybe w/ subsection other parameters are
7 7
       allowed: see man(7), man(1). -->
8 8
  <!ENTITY dhsection   "<manvolnum>8</manvolnum>">
......
20 20
    <copyright>
21 21
      <year>2006</year>
22 22
      <year>2007</year>
23
      <year>2008</year>
23 24
      <holder>Google Inc.</holder>
24 25
    </copyright>
25 26
    &dhdate;
......
114 115
            </group></arg>
115 116
          <sbr>
116 117

  
117
          <arg choice="req">-n <replaceable>node<optional>:secondary-node</optional></replaceable></arg>
118
          <group choice="req">
119
            <arg>-n <replaceable>node<optional>:secondary-node</optional></replaceable></arg>
120
            <arg>--iallocator <replaceable>name</replaceable></arg>
121
          </group>
122
          <sbr>
123

  
118 124
          <arg choice="req">-o <replaceable>os-type</replaceable></arg>
119 125
          <sbr>
120 126

  
......
235 241
        </para>
236 242

  
237 243
        <para>
238
          The <option>--hvm-cdrom-image-path</option> specifies the
244
          The <option>--hvm-cdrom-image-path</option> option specifies the
239 245
          path to the file xen uses to emulate a virtual CDROM drive
240 246
          for this HVM instance. Valid values are either an
241 247
          absolute path to an existing file or None, which disables
......
243 249
        </para>
244 250

  
245 251
        <para>
246
          The <option>--vnc-bind-address</option> specifies the
252
          The <option>--vnc-bind-address</option> option specifies the
247 253
          address that the VNC listener for this instance should bind
248 254
          to. Valid values are IPv4 addresses. Use the address 0.0.0.0
249 255
          to bind to all available interfaces.
250 256
        </para>
251 257

  
252 258
        <para>
253
          The <option>--kernel</option> options allows the instance to
259
          The <option>--iallocator</option> option specifies the instance
260
          allocator plugin to use. If you pass in this option the allocator
261
          will select nodes for this instance automatically, so you don't need
262
          to pass them with the <option>-n</option> option. For more
263
          information please refer to the instance allocator documentation.
264
        </para>
265

  
266
        <para>
267
          The <option>--kernel</option> option allows the instance to
254 268
          use a custom kernel (if a filename is passed) or to use the
255 269
          default kernel (<filename>@CUSTOM_XEN_KERNEL@</filename>), if the
256 270
          string <constant>default</constant> is passed.
......
980 994

  
981 995
        <cmdsynopsis>
982 996
          <command>replace-disks</command>
997

  
998
          <group choice="req">
999
            <arg>--iallocator <replaceable>name</replaceable></arg>
1000
            <arg>--new-secondary <replaceable>NODE</replaceable></arg>
1001
          </group>
1002
          <sbr>
1003

  
983 1004
          <arg choice="opt">-s</arg>
984
          <arg choice="req">--new-secondary <replaceable>NODE</replaceable></arg>
985 1005
          <arg choice="req"><replaceable>instance</replaceable></arg>
986 1006
        </cmdsynopsis>
987 1007

  
988 1008
        <cmdsynopsis>
989 1009
          <command>replace-disks</command>
1010

  
990 1011
          <group>
991 1012
          <arg choice="req">-s</arg>
992 1013
          <arg choice="req">-p</arg>
......
1007 1028
          node of the instance only, without changing the node.
1008 1029
        </para>
1009 1030

  
1031
        <para>
1032
          Specifying <option>--iallocator</option> enables secondary node
1033
          replacement and and makes the new secondary be selected automatically
1034
          by the specified allocator plugin.
1035
        </para>
1010 1036
      </refsect3>
1011 1037

  
1012 1038
      <refsect3>

Also available in: Unified diff