Revision 7d713344 man/gnt-instance.sgml

b/man/gnt-instance.sgml
113 113
        <para>
114 114
          Creates a new instance on the specified host. The
115 115
          <replaceable>instance</replaceable> argument must be in DNS,
116
          but depending on the bridge setup, need not be in the same
117
          network as the nodes in the cluster.
116
          but depending on the bridge/routing setup, need not be in
117
          the same network as the nodes in the cluster.
118 118
        </para>
119 119

  
120 120
        <para>
......
149 149
        <para>
150 150
          The NICs of the instances can be specified via the
151 151
          <option>--net</option> option. By default, one NIC is
152
          created for the instance, with a random MAC, and connected
153
          to the default bridge. Each NIC can take up to three
154
          parameters (all optional):
152
          created for the instance, with a random MAC, and set
153
          up according the the cluster level nic parameters.
154
          Each NIC can take these parameters (all optional):
155 155
          <variablelist>
156 156
            <varlistentry>
157 157
              <term>mac</term>
......
170 170
              </listitem>
171 171
            </varlistentry>
172 172
            <varlistentry>
173
              <term>bridge</term>
173
              <term>mode</term>
174 174
              <listitem>
175
                <simpara>specifies the bridge to attach this NIC
176
                  to</simpara>
175
                <simpara>specifies the connection mode for this nic:
176
                  routed or bridged.</simpara>
177
              </listitem>
178
            </varlistentry>
179
            <varlistentry>
180
              <term>link</term>
181
              <listitem>
182
                <simpara>in bridged mode specifies the bridge to attach
183
                  this NIC to, in routed mode it's intended to
184
                  differentiate between different routing tables/instance
185
                  groups (but the meaning is dependent on the network
186
                  script)</simpara>
177 187
              </listitem>
178 188
            </varlistentry>
179 189
          </variablelist>
190
          Of these "mode" and "link" are nic parameters, and inherit their
191
          default at cluster level.
180 192
        </para>
181 193

  
182 194
        <para>
......
674 686
              </listitem>
675 687
            </varlistentry>
676 688
            <varlistentry>
677
              <term>mac, ip, bridge</term>
689
              <term>mac, ip, mode, link</term>
678 690
              <listitem>
679 691
                <simpara>Specifications for the one NIC that will be
680 692
                created for the instance.</simpara>
......
912 924
                <simpara>the first instance interface MAC address</simpara>
913 925
              </listitem>
914 926
            </varlistentry>
927

  
928
            <varlistentry>
929
              <term>mode</term>
930
              <listitem>
931
                <simpara>the mode of the first instance NIC
932
                (routed or bridged)</simpara>
933
              </listitem>
934
            </varlistentry>
915 935
            <varlistentry>
916
              <term>bridge</term>
936
              <term>link</term>
917 937
              <listitem>
918
                <simpara>the bridge of the first instance NIC
938
                <simpara>the link of the first instance NIC
919 939
                </simpara>
920 940
              </listitem>
921 941
            </varlistentry>
......
1015 1035
              </listitem>
1016 1036
            </varlistentry>
1017 1037
            <varlistentry>
1018
              <term>nic.bridge/N</term>
1038
              <term>nic.mode/N</term>
1019 1039
              <listitem>
1020
                <simpara>The bridge the Nth instance NIC is attached
1021
                to.</simpara>
1040
                <simpara>The mode of the Nth instance NIC</simpara>
1041
              </listitem>
1042
            </varlistentry>
1043
            <varlistentry>
1044
              <term>nic.link/N</term>
1045
              <listitem>
1046
                <simpara>The link of the Nth instance NIC</simpara>
1022 1047
              </listitem>
1023 1048
            </varlistentry>
1024 1049
            <varlistentry>
......
1036 1061
              </listitem>
1037 1062
            </varlistentry>
1038 1063
            <varlistentry>
1039
              <term>nic.bridges</term>
1064
              <term>nic.modes</term>
1040 1065
              <listitem>
1041
                <simpara>A comma-separated list of all the bridges of the
1066
                <simpara>A comma-separated list of all the modes of the
1042 1067
                instance's NICs.</simpara>
1043 1068
              </listitem>
1044 1069
            </varlistentry>
1045 1070
            <varlistentry>
1071
              <term>nic.links</term>
1072
              <listitem>
1073
                <simpara>A comma-separated list of all the link parameters
1074
                of the instance's NICs.</simpara>
1075
              </listitem>
1076
            </varlistentry>
1077
            <varlistentry>
1046 1078
              <term>nic.count</term>
1047 1079
              <listitem>
1048 1080
                <simpara>The number of instance nics.</simpara>
......
1176 1208

  
1177 1209
        <para>
1178 1210
          Modifies the memory size, number of vcpus, ip address, MAC
1179
          address and/or bridge for an instance. It can also add and
1180
          remove disks and NICs to/from the instance. Note that you
1181
          need to give at least one of the arguments, otherwise the
1182
          command complains.
1211
          address and/or nic parameters for an instance. It can also
1212
          add and remove disks and NICs to/from the instance. Note
1213
          that you need to give at least one of the arguments, otherwise
1214
          the command complains.
1183 1215
        </para>
1184 1216

  
1185 1217
        <para>
......
1203 1235
          The <option>--net
1204 1236
          add:<replaceable>options</replaceable></option> option will
1205 1237
          add a new NIC to the instance. The available options are the
1206
          same as in the <command>add</command> command (mac, ip,
1207
          bridge). The <option>--net remove</option> will remove the
1238
          same as in the <command>add</command> command (mac, ip, link,
1239
          mode). The <option>--net remove</option> will remove the
1208 1240
          last NIC of the instance, while the <option>--net
1209 1241
          <replaceable>N</replaceable>:<replaceable>options</replaceable></option>
1210 1242
          option will change the parameters of the Nth instance NIC.

Also available in: Unified diff