Revision 87e23f2d lib/cmdlib/cluster.py
| b/lib/cmdlib/cluster.py | ||
|---|---|---|
| 791 | 791 |
errors.ECODE_ENVIRON) |
| 792 | 792 |
|
| 793 | 793 |
@staticmethod |
| 794 |
def _GetEnabledDiskTemplatesInner(op_enabled_disk_templates,
|
|
| 795 |
old_enabled_disk_templates):
|
|
| 794 |
def _GetDiskTemplateSetsInner(op_enabled_disk_templates,
|
|
| 795 |
old_enabled_disk_templates): |
|
| 796 | 796 |
"""Determines the enabled disk templates and the subset of disk templates |
| 797 | 797 |
that are newly enabled by this operation. |
| 798 | 798 |
|
| ... | ... | |
| 808 | 808 |
enabled_disk_templates = old_enabled_disk_templates |
| 809 | 809 |
return (enabled_disk_templates, new_enabled_disk_templates) |
| 810 | 810 |
|
| 811 |
def _GetEnabledDiskTemplates(self, cluster):
|
|
| 811 |
def _GetDiskTemplateSets(self, cluster):
|
|
| 812 | 812 |
"""Determines the enabled disk templates and the subset of disk templates |
| 813 | 813 |
that are newly enabled by this operation. |
| 814 | 814 |
|
| 815 | 815 |
""" |
| 816 |
return self._GetEnabledDiskTemplatesInner(self.op.enabled_disk_templates,
|
|
| 817 |
cluster.enabled_disk_templates)
|
|
| 816 |
return self._GetDiskTemplateSetsInner(self.op.enabled_disk_templates,
|
|
| 817 |
cluster.enabled_disk_templates) |
|
| 818 | 818 |
|
| 819 | 819 |
def _CheckIpolicy(self, cluster, enabled_disk_templates): |
| 820 | 820 |
"""Checks the ipolicy. |
| ... | ... | |
| 946 | 946 |
if node.uuid in node_uuids and node.vm_capable] |
| 947 | 947 |
|
| 948 | 948 |
(enabled_disk_templates, new_enabled_disk_templates) = \ |
| 949 |
self._GetEnabledDiskTemplates(cluster)
|
|
| 949 |
self._GetDiskTemplateSets(cluster)
|
|
| 950 | 950 |
|
| 951 | 951 |
self._CheckVgName(vm_capable_node_uuids, enabled_disk_templates, |
| 952 | 952 |
new_enabled_disk_templates) |
Also available in: Unified diff