commit 4e57080d257e4a8bbae92b86233f3eade8bd6aa6
Merge: 8a96e60 9db0b35
Author: Michele Tartara <[email protected]>
Date: Fri May 3 13:23:22 2013 +0000
Merge remote-tracking branch 'origin/stable-2.8'
Conflicts:
lib/bdev.py
lib/cmdlib.py
diff --cc NEWS
index 9fe93ca,6fad866..7efc96e
--- a/NEWS
+++ b/NEWS
@@@ -22,14 -22,12 +22,14 @@@ Version 2.8.0 beta
creation.
- ``cfgupgrade`` now supports a ``--downgrade`` option to bring the
configuration back to the previous stable version.
+- The cluster option '--no-lvm-storage' was removed in favor of the new option
+ '--enabled-disk-templates'.
- Version 2.7.0 beta3
- -------------------
+ Version 2.7.0 rc1
+ -----------------
- *(Released Mon, 22 Apr 2013)*
+ *(unreleased)*
Incompatible/important changes
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
diff --cc lib/cmdlib.py
index 553e645,64b8c47..82f7b2e
--- a/lib/cmdlib.py
+++ b/lib/cmdlib.py
@@@ -4274,13 -4226,27 +4274,28 @@@ class LUClusterSetParams(LogicalUnit)
errors.ECODE_INVAL)
node_list = self.owned_locks(locking.LEVEL_NODE)
+ self.cluster = cluster = self.cfg.GetClusterInfo()
- (enabled_disk_templates, new_enabled_disk_templates) = \
- self._GetEnabledDiskTemplates(cluster)
-
- self._CheckVgName(node_list, enabled_disk_templates,
- new_enabled_disk_templates)
+ vm_capable_nodes = [node.name
+ for node in self.cfg.GetAllNodesInfo().values()
+ if node.name in node_list and node.vm_capable]
+
+ # if vg_name not None, checks given volume group on all nodes
+ if self.op.vg_name:
+ vglist = self.rpc.call_vg_list(vm_capable_nodes)
+ for node in vm_capable_nodes:
+ msg = vglist[node].fail_msg
+ if msg:
+ # ignoring down node
+ self.LogWarning("Error while gathering data on node %s"
+ " (ignoring node): %s", node, msg)
+ continue
+ vgstatus = utils.CheckVolumeGroupSize(vglist[node].payload,
+ self.op.vg_name,
+ constants.MIN_VG_SIZE)
+ if vgstatus:
+ raise errors.OpPrereqError("Error on node '%s': %s" %
+ (node, vgstatus), errors.ECODE_ENVIRON)
if self.op.drbd_helper:
# checks given drbd helper on all nodes
