Commit 5ee6fffc authored by Michael Hanselmann's avatar Michael Hanselmann
Browse files

Merge branch 'devel-2.2'



* devel-2.2:
  NEWS: Add 2.2.0~rc2 release date
  Bump version to 2.2.0~rc2
  Fix mac checker regex
  Remove two old aliases
  Fix migration on new KVMs
  Fix typo in ganeti man page
  cli: Pass options in {Add,Remove}Tags
  Prepare 2.2.0~rc2 release
Signed-off-by: default avatarMichael Hanselmann <hansmi@google.com>
Reviewed-by: default avatarRené Nussbaumer <rn@google.com>
parents db5bce34 227e546f
News
====
Version 2.2.0 rc2
-----------------
*(Released Wed, 22 Sep 2010)*
- Fixed OS_VARIANT variable for OS scripts
- Fixed cluster tag operations via RAPI
- Made ``setup-ssh`` exit with non-zero code if an error occurred
- Disabled RAPI CA checks in watcher
Version 2.2.0 rc1
-----------------
......
......@@ -2,7 +2,7 @@
m4_define([gnt_version_major], [2])
m4_define([gnt_version_minor], [2])
m4_define([gnt_version_revision], [0])
m4_define([gnt_version_suffix], [~rc1])
m4_define([gnt_version_suffix], [~rc2])
m4_define([gnt_version_full],
m4_format([%d.%d.%d%s],
gnt_version_major, gnt_version_minor,
......
......@@ -391,7 +391,7 @@ def AddTags(opts, args):
if not args:
raise errors.OpPrereqError("No tags to be added")
op = opcodes.OpAddTags(kind=kind, name=name, tags=args)
SubmitOpCode(op)
SubmitOpCode(op, opts=opts)
def RemoveTags(opts, args):
......@@ -408,7 +408,7 @@ def RemoveTags(opts, args):
if not args:
raise errors.OpPrereqError("No tags to be removed")
op = opcodes.OpDelTags(kind=kind, name=name, tags=args)
SubmitOpCode(op)
SubmitOpCode(op, opts=opts)
def check_unit(option, opt, value): # pylint: disable-msg=W0613
......
......@@ -924,10 +924,6 @@ class KVMHypervisor(hv_base.BaseHypervisor):
if not alive:
raise errors.HypervisorError("Instance not running, cannot migrate")
if not netutils.TcpPing(target, port, live_port_needed=True):
raise errors.HypervisorError("Remote host %s not listening on port"
" %s, cannot migrate" % (target, port))
if not live:
self._CallMonitorCommand(instance_name, 'stop')
......
......@@ -90,6 +90,9 @@ _VALID_SERVICE_NAME_RE = re.compile("^[-_.a-zA-Z0-9]{1,128}$")
_MCL_CURRENT = 1
_MCL_FUTURE = 2
#: MAC checker regexp
_MAC_CHECK = re.compile("^([0-9a-f]{2}:){5}[0-9a-f]{2}$", re.I)
class RunResult(object):
"""Holds the result of running external programs.
......@@ -2004,8 +2007,7 @@ def NormalizeAndValidateMac(mac):
@raise errors.OpPrereqError: If the MAC isn't valid
"""
mac_check = re.compile("^([0-9a-f]{2}(:|$)){6}$", re.I)
if not mac_check.match(mac):
if not _MAC_CHECK.match(mac):
raise errors.OpPrereqError("Invalid MAC address specified: %s" %
mac, errors.ECODE_INVAL)
......
......@@ -193,7 +193,7 @@
<varlistentry>
<term>canceling</term>
<listitem>
<para>The jos is waiting for locks, but is has been
<para>The job is waiting for locks, but is has been
marked for cancellation. It will not transition to
<emphasis>running</emphasis>, but to
<emphasis>canceled</emphasis>.
......
......@@ -1538,8 +1538,6 @@ commands = {
#: dictionary with aliases for commands
aliases = {
'activate_block_devs': 'activate-disks',
'replace_disks': 'replace-disks',
'start': 'startup',
'stop': 'shutdown',
}
......
......@@ -136,6 +136,7 @@ def _OsStatus(status, diagnose):
else:
return "invalid - %s" % diagnose
def DiagnoseOS(opts, args):
"""Analyse all OSes on this cluster.
......
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