Commit 8a4666cc authored by Leigh B Stoller's avatar Leigh B Stoller

Pass XEN_CORES through when not a shared node, or if an admin.

parent 066d3361
......@@ -1400,6 +1400,12 @@ sub LoadVirtNodes($)
$attr->attrkey() eq "MEMORYSIZE") {
$vnode->_desires()->{"?+ram"} = $attr->attrvalue();
}
elsif ($attr->attrkey() eq "XEN_CORES") {
# Overridden below for shared nodes.
$self->experiment()->SetVirtNodeAttribute($vname,
"VM_VCPUS",
$attr->attrvalue());
}
}
$vnode->_atttributes($attrs);
......@@ -1449,7 +1455,7 @@ sub LoadVirtNodes($)
# We will deal with later, but set a default=1 for now.
$self->experiment()->SetVirtNodeAttribute($vname, "VM_VCPUS", 1)
if (!$self->user()->IsAdmin());
if ($vnode->_sharedokay() && !$self->user()->IsAdmin());
}
#
......
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