Commit c57f169e authored by Guido Trotter's avatar Guido Trotter
Browse files

Merge branch 'master' into next

* master:
  Update NEWS and version for 2.0.1 release
  gnt-{instance,backup}(8) --nic is actually --net
  Fix a wrong function name in backend.DrbdAttachNet
  GNT-CLUSTER(8) fix search-tags example
parents fecbe9d5 0dea942c
Version 2.0.1
- added -H/-B startup parameters to gnt-instance, which will allow
re-adding the start in single-user option (regression from 1.2)
- the watcher writes the instance status to a file, to allow
monitoring to report the instance status (from the master) based on
cached results of the watcher's queries; while this can get stale if
the watcher is being locked due to other work on the cluster, this
is still an improvement
- the watcher now also restarts the node daemon and the rapi daemon if
they died
- fixed the watcher to handle full and drained queue cases
- hooks export more instance data in the environment, which helps if
hook scripts need to take action based on the instance's properties
(no longer need to query back into ganeti)
- instance failovers when the instance is stopped do not check for
free RAM, so that failing over a stopped instance is possible in low
memory situations
- rapi uses queries for tags instead of jobs (for less job traffic),
and for cluster tags it won't talk to masterd at all but read them
from ssconf
- a couple of error handling fixes in RAPI
- drbd handling: improved the error handling of inconsistent disks
after resync to reduce the frequency of "there are some degraded
disks for this instance" message
- fixed a bug in live migration when DRBD doesn't want to reconnect
(the error handling path called a wrong function name)
Version 2.0.0 final
- no changes from rc5
......
# Configure script for Ganeti
m4_define([gnt_version_major], [2])
m4_define([gnt_version_minor], [0])
m4_define([gnt_version_revision], [0])
m4_define([gnt_version_revision], [1])
m4_define([gnt_version_suffix], [])
m4_define([gnt_version_full],
m4_format([%d.%d.%d%s],
......
......@@ -2392,7 +2392,7 @@ def DrbdAttachNet(nodes_ip, disks, instance_name, multimaster):
# standalone, even though this should not happen with the
# new staged way of changing disk configs
try:
rd.ReAttachNet(multimaster)
rd.AttachNet(multimaster)
except errors.BlockDeviceError, err:
return (False, "Can't change network configuration: %s" % str(err))
if all_connected:
......
......@@ -168,7 +168,7 @@
<para>
The NICs of the instances can be specified via the
<option>--nic</option> option. By default, one NIC is created
<option>--net</option> option. By default, one NIC is created
for the instance, with the MAC set to the original MAC of the
instance (as it was at export time). Each NIC can take up to
three parameters (all optional):
......
......@@ -627,7 +627,7 @@
Example:
</para>
<screen>
# gnt-cluster search time
# gnt-cluster search-tags time
/cluster ctime:2007-09-01
/nodes/node1.example.com mtime:2007-10-04
</screen>
......
......@@ -148,7 +148,7 @@
<para>
The NICs of the instances can be specified via the
<option>--nic</option> option. By default, one NIC is
<option>--net</option> option. By default, one NIC is
created for the instance, with a random MAC, and connected
to the default bridge. Each NIC can take up to three
parameters (all optional):
......@@ -1200,12 +1200,12 @@ instance5: 11225
</para>
<para>
The <option>--nic
The <option>--net
add:<replaceable>options</replaceable></option> option will
add a new NIC to the instance. The available options are the
same as in the <command>add</command> command (mac, ip,
bridge). The <option>--nice remove</option> will remove the
last NIC of the instance, while the <option>--nic
bridge). The <option>--net remove</option> will remove the
last NIC of the instance, while the <option>--net
<replaceable>N</replaceable>:<replaceable>options</replaceable></option>
option will change the parameters of the Nth instance NIC.
</para>
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment