This patches fixes a typo and some indentation errors
that were accidentally introduced by premature pushing
of the patch series "Improvements on disk templates, in
particular file storage".
Signed-off-by: Helga Velroyen <helgav@google.com>
Reviewed-by: Jose Lopes <jabolopes@google.com>
if op_enabled_disk_templates:
enabled_disk_templates = op_enabled_disk_templates
new_enabled_disk_templates = \
if op_enabled_disk_templates:
enabled_disk_templates = op_enabled_disk_templates
new_enabled_disk_templates = \
- list(set(enabled_disk_templates)
- - set(old_enabled_disk_templates))
+ list(set(enabled_disk_templates)
+ - set(old_enabled_disk_templates))
disabled_disk_templates = \
disabled_disk_templates = \
- list(set(old_enabled_disk_templates)
- - set(enabled_disk_templates))
+ list(set(old_enabled_disk_templates)
+ - set(enabled_disk_templates))
else:
enabled_disk_templates = old_enabled_disk_templates
return (enabled_disk_templates, new_enabled_disk_templates,
else:
enabled_disk_templates = old_enabled_disk_templates
return (enabled_disk_templates, new_enabled_disk_templates,
def _CheckInstancesOfDisabledDiskTemplates(
self, disabled_disk_templates):
def _CheckInstancesOfDisabledDiskTemplates(
self, disabled_disk_templates):
- """Check whether we try to a disk template that is in use.
+ """Check whether we try to disable a disk template that is in use.
@type disabled_disk_templates: list of string
@param disabled_disk_templates: list of disk templates that are going to
@type disabled_disk_templates: list of string
@param disabled_disk_templates: list of disk templates that are going to
if node.uuid in node_uuids and node.vm_capable]
(enabled_disk_templates, new_enabled_disk_templates,
if node.uuid in node_uuids and node.vm_capable]
(enabled_disk_templates, new_enabled_disk_templates,
- disabled_disk_templates) = self._GetDiskTemplateSets(cluster)
+ disabled_disk_templates) = self._GetDiskTemplateSets(cluster)
self._CheckInstancesOfDisabledDiskTemplates(disabled_disk_templates)
self._CheckVgName(vm_capable_node_uuids, enabled_disk_templates,
self._CheckInstancesOfDisabledDiskTemplates(disabled_disk_templates)
self._CheckVgName(vm_capable_node_uuids, enabled_disk_templates,