shaba/one
1
0
Fork 0
mirror of https://github.com/OpenNebula/one.git synced 2025-03-22 18:50:08 +03:00
Code Releases Wiki Activity

Merge branch 'master' into feature-1712

Browse Source
This commit is contained in:
Ruben S. Montero 2013-09-16 12:02:31 +02:00
commit 46bcb93b26
2 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/sunstone/public/js/plugins/templates-tab.js
View File

@ -809,7 +809,8 @@ function setup_capacity_tab_content(capacity_section) {
connect: "lower",
range: [0,409600],
step: 12800,
start: 1,
start: 51200,
value: 512,
slide: memory_slider_change,
});
@ -826,9 +827,6 @@ function setup_capacity_tab_content(capacity_section) {
memory_input.val( Math.floor(final_memory_input.val()) );
})
// init::start is ignored for some reason
memory_slider.val(0);
memory_unit.change(function() {
var memory_unit_val = $('#memory_unit :selected', capacity_section).val();
@ -844,6 +842,7 @@ function setup_capacity_tab_content(capacity_section) {
range: [0,1600],
start: 1,
step: 50,
value: 51200,
slide: memory_slider_change,
});
@ -859,6 +858,7 @@ function setup_capacity_tab_content(capacity_section) {
connect: "lower",
range: [0,409600],
start: 1,
value: 51200,
step: 12800,
slide: memory_slider_change,
});
@ -873,6 +873,9 @@ function setup_capacity_tab_content(capacity_section) {
}
});
// init::start is ignored for some reason
memory_input.val(512);
// Define the vcpu slider
@ -4585,6 +4588,9 @@ function fillTemplatePopUp(request, response){
var context = template.CONTEXT;
var context_section = $('li#contextTab', $create_template_dialog);
$("#ssh_context", context_section).removeAttr('checked');
$("#network_context", context_section).removeAttr('checked');
if (context) {
var file_ds_regexp = /\$FILE\[IMAGE_ID=([0-9]+)+/g;
var net_regexp = /^NETWORK$/;;
@ -4595,8 +4601,6 @@ function fillTemplatePopUp(request, response){
var net_flag = false;
var files = [];
$("#ssh_context", context_section).removeAttr('checked');
$("#network_context", context_section).removeAttr('checked');
$.each(context, function(key, value){
if (ssh_regexp.test(key)) {
$("#ssh_context", context_section).attr('checked','checked');

3
src/vnm_mad/remotes/OpenNebulaNetwork.rb
View File

@ -42,6 +42,9 @@ COMMANDS = {
:lsmod => "lsmod"
}
# Set PATH
ENV['PATH'] = "#{ENV['PATH']}:/bin:/sbin:/usr/bin"
class VM
attr_accessor :nics, :vm_info, :deploy_id