mirror of
https://github.com/OpenNebula/one.git
synced 2026-11-21 04:12:37 +09:00
Merge remote-tracking branch 'upstream/one-5.4' into one-5.4
This commit is contained in:
4 files changed
+19
-30
No files matched your search
@@ -128,8 +128,8 @@ stop()
|
||||
[ "$novnc" = "1" ] && $NOVNC_SERVER stop
|
||||
|
||||
if [ ! -f $SUNSTONE_PID ]; then
|
||||
echo "Couldn't find sunstone-server process pid."
|
||||
exit 1
|
||||
echo "Couldn't find sunstone-server process pid." >&2
|
||||
return 1
|
||||
fi
|
||||
|
||||
# Kill the sunstone daemon
|
||||
@@ -140,6 +140,7 @@ stop()
|
||||
rm -f $SUNSTONE_PID &> /dev/null
|
||||
|
||||
echo "sunstone-server stopped"
|
||||
return 0
|
||||
}
|
||||
|
||||
case "$1" in
|
||||
@@ -149,9 +150,10 @@ case "$1" in
|
||||
;;
|
||||
stop)
|
||||
stop -n
|
||||
exit $?
|
||||
;;
|
||||
restart)
|
||||
stop -n
|
||||
stop -n 2> /dev/null
|
||||
setup
|
||||
start -n
|
||||
;;
|
||||
@@ -163,7 +165,7 @@ case "$1" in
|
||||
stop
|
||||
;;
|
||||
restart-sunstone)
|
||||
stop
|
||||
stop -n 2> /dev/null
|
||||
setup
|
||||
start
|
||||
;;
|
||||
|
||||
@@ -979,7 +979,6 @@ define(function(require) {
|
||||
$(".provision_capacity_selector", create_vm_context),
|
||||
template_json.VMTEMPLATE);
|
||||
|
||||
that.original_disks = jQuery.extend(true, {}, template_json.VMTEMPLATE.TEMPLATE.DISK);
|
||||
var disksContext = $(".provision_disk_selector", create_vm_context);
|
||||
disksContext.data("template_json", template_json);
|
||||
|
||||
@@ -1091,29 +1090,13 @@ define(function(require) {
|
||||
var vm_name = $("#vm_name", context).val();
|
||||
var nics = NicsSection.retrieve(context);
|
||||
|
||||
var odisks = that.original_disks;
|
||||
if (!Array.isArray(odisks)){
|
||||
odisks = [odisks];
|
||||
}
|
||||
var disks = DisksResize.retrieve($(".provision_disk_selector", context));
|
||||
$.each(disks, function(dkey, dvalue){
|
||||
$.each(odisks, function(okey, ovalue){
|
||||
if (dvalue.DISK_ID == ovalue.DISK_ID && dvalue.IMAGE_ID){
|
||||
if (dvalue.SIZE != ovalue.SIZE) {
|
||||
var disk = { IMAGE_ID: dvalue.IMAGE_ID, SIZE: dvalue.SIZE };
|
||||
} else {
|
||||
var disk = { IMAGE_ID: dvalue.IMAGE_ID };
|
||||
}
|
||||
disks[dkey] = disk;
|
||||
}
|
||||
});
|
||||
});
|
||||
|
||||
var extra_info = {
|
||||
'vm_name' : vm_name,
|
||||
'template': {
|
||||
}
|
||||
}
|
||||
};
|
||||
|
||||
var vmgroup = VMGroupSection.retrieve($(".vmgroupContext"+ template_id));
|
||||
|
||||
|
||||
@@ -125,6 +125,7 @@ define(function(require){
|
||||
'</div>' +
|
||||
'</div>').appendTo($(".disksContainer", disksContext));
|
||||
if (disks_base) {
|
||||
disks_base[disk_id].SIZE = disk.SIZE;
|
||||
diskContext.data('template_disk', disks_base[disk_id]);
|
||||
}
|
||||
|
||||
@@ -222,14 +223,17 @@ define(function(require){
|
||||
disk = $(this).data("template_disk");
|
||||
|
||||
var fields = WizardFields.retrieve(this);
|
||||
|
||||
if (fields.SIZE != undefined){
|
||||
disk['SIZE'] = fields.SIZE;
|
||||
if (disk["SIZE"] && fields["SIZE"] && disk["SIZE"] === fields["SIZE"]){
|
||||
delete disk["SIZE"];
|
||||
disks.push(disk);
|
||||
}
|
||||
else if (fields.SIZE != undefined){
|
||||
var size = $.extend(true, [], fields.SIZE);
|
||||
var size = size.join("");
|
||||
var diskAux = $.extend(true, {}, disk);
|
||||
diskAux["SIZE"] = fields.SIZE;
|
||||
disks.push(diskAux);
|
||||
}
|
||||
}
|
||||
|
||||
if (disk) {
|
||||
disks.push(disk);
|
||||
}
|
||||
});
|
||||
|
||||
|
||||
@@ -831,7 +831,7 @@ private
|
||||
if cpu[:datapoints].size != 0
|
||||
cpu = cpu[:datapoints][-1][:average]
|
||||
else
|
||||
cpu = 0
|
||||
cpu = onevm["MONITORING/CPU"] || 0
|
||||
end
|
||||
cpu = cpu.to_f.round(2).to_s
|
||||
rescue => e
|
||||
|
||||
Reference in new issue
Block a user