Commit 9f53d9ce authored by Michael Hanselmann's avatar Michael Hanselmann
Browse files

Merge remote branch 'origin/stable-2.1' into devel-2.1

* origin/stable-2.1:
  Bump version to 2.1.0~rc5
  Fix missing bridge for xen instances
  Fix flipping MC flag bug
  ganeti-watcher: ensure confd is running as well
parents eb732fb5 8432c491
......@@ -2,7 +2,7 @@
m4_define([gnt_version_major], [2])
m4_define([gnt_version_minor], [1])
m4_define([gnt_version_revision], [0])
m4_define([gnt_version_suffix], [~rc4])
m4_define([gnt_version_suffix], [~rc5])
m4_define([gnt_version_full],
m4_format([%d.%d.%d%s],
gnt_version_major, gnt_version_minor,
......
......@@ -486,6 +486,8 @@ def main():
try:
# on master or not, try to start the node dameon
EnsureDaemon(constants.NODED)
# start confd as well. On non candidates it will be in disabled mode.
EnsureDaemon(constants.CONFD)
notepad = WatcherState()
try:
......
......@@ -3206,7 +3206,7 @@ class LUSetNodeParams(LogicalUnit):
# If we're being deofflined/drained, we'll MC ourself if needed
if (deoffline_or_drain and not offline_or_drain and not
self.op.master_candidate == True):
self.op.master_candidate == True and not node.master_candidate):
self.op.master_candidate = _DecideSelfPromotion(self)
if self.op.master_candidate:
self.LogInfo("Autopromoting node to master candidate")
......
......@@ -496,9 +496,9 @@ class XenPvmHypervisor(XenHypervisor):
ip = getattr(nic, "ip", None)
if ip is not None:
nic_str += ", ip=%s" % ip
vif_data.append("'%s'" % nic_str)
if nic.nicparams[constants.NIC_MODE] == constants.NIC_MODE_BRIDGED:
nic_str += ", bridge=%s" % nic.nicparams[constants.NIC_LINK]
vif_data.append("'%s'" % nic_str)
disk_data = cls._GetConfigFileDiskData(block_devices)
......@@ -624,9 +624,9 @@ class XenHvmHypervisor(XenHypervisor):
ip = getattr(nic, "ip", None)
if ip is not None:
nic_str += ", ip=%s" % ip
vif_data.append("'%s'" % nic_str)
if nic.nicparams[constants.NIC_MODE] == constants.NIC_MODE_BRIDGED:
nic_str += ", bridge=%s" % nic.nicparams[constants.NIC_LINK]
vif_data.append("'%s'" % nic_str)
config.write("vif = [%s]\n" % ",".join(vif_data))
disk_data = cls._GetConfigFileDiskData(block_devices)
......
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