Commit 72080db1 authored by Helga Velroyen's avatar Helga Velroyen
Browse files

Let instance creation fall back to default disk template



So far, the '-t' option of 'gnt-instance add' is mandatory.
This patch makes it optional. In case, no disk template is
specified, the first of the list of enabled_disk_templates
is used.
Signed-off-by: default avatarHelga Velroyen <helgav@google.com>
Reviewed-by: default avatarMichele Tartara <mtartara@google.com>
parent dab6ea3d
......@@ -327,6 +327,13 @@ class LUInstanceCreate(LogicalUnit):
"""
cluster = self.cfg.GetClusterInfo()
if self.op.disk_template is None:
# FIXME: It would be better to take the default disk template from the
# ipolicy, but for the ipolicy we need the primary node, which we get from
# the iallocator, which wants the disk template as input. To solve this
# chicken-and-egg problem, it should be possible to specify just a node
# group from the iallocator and take the ipolicy from that.
self.op.disk_template = cluster.enabled_disk_templates[0]
if not self.op.disk_template in cluster.enabled_disk_templates:
raise errors.OpPrereqError("Cannot create an instance with disk template"
" '%s', because it is not enabled in the"
......@@ -713,21 +720,6 @@ class LUInstanceCreate(LogicalUnit):
"""
self.op.os_type = einfo.get(constants.INISECT_EXP, "os")
if self.op.disk_template is None:
if einfo.has_option(constants.INISECT_INS, "disk_template"):
self.op.disk_template = einfo.get(constants.INISECT_INS,
"disk_template")
if self.op.disk_template not in constants.DISK_TEMPLATES:
raise errors.OpPrereqError("Disk template specified in configuration"
" file is not one of the allowed values:"
" %s" %
" ".join(constants.DISK_TEMPLATES),
errors.ECODE_INVAL)
else:
raise errors.OpPrereqError("No disk template specified and the export"
" is missing the disk_template information",
errors.ECODE_INVAL)
if not self.op.disks:
disks = []
# TODO: import the disk iv_name too
......
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