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

F #2652: Allow boot order for vcenter in Sunstone

Browse Source
This commit is contained in:
juanmont 2018-12-18 10:06:55 +01:00 committed by Tino Vázquez
parent dc33d72fc1
commit 4924779fa0
3 changed files with 17 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/sunstone/public/app/tabs/templates-tab/form-panels/create/wizard-tabs/general.js
View File

@ -207,20 +207,20 @@ define(function(require) {
});
context.on("change", "input[name='hypervisor']", function() {
// TODO define context (for example: this.closest('form'))
$(".hypervisor").hide();
$(".only_" + this.value).show();
if (this.value == "vcenter"){
$("#vcenter_template_ref", context).attr("required", "");
$("#vcenter_instance_id", context).attr("required", "");
$("#vcenter_ccr_ref", context).attr("required", "");
$("#MEMORY", context).attr("pattern", "^([048]|\\d*[13579][26]|\\d*[24680][048])$");
$('.only_kvm').hide();
$('.only_vcenter').show();
} else {
$("#vcenter_template_ref", context).removeAttr("required");
$("#vcenter_instance_id", context).removeAttr("required");
$("#vcenter_ccr_ref", context).removeAttr("required");
$("#MEMORY", context).removeAttr("pattern");
$('.only_kvm').show();
$('.only_vcenter').hide();
}
// There is another listener in context.js setup
});
@ -236,9 +236,13 @@ define(function(require) {
if (config["mode"] === "kvm"){
$("#kvmRadio", context).click();
$("#template_hypervisor_form", context).hide();
$('.only_kvm').show();
$('.only_vcenter').hide();
} else if (config["mode"] === "vcenter"){
$("#vcenterRadio", context).click();
$("#template_hypervisor_form", context).hide();
$('.only_kvm').hide();
$('.only_vcenter').show();
}
}

2
src/sunstone/public/app/tabs/templates-tab/form-panels/create/wizard-tabs/os.js
View File

@ -146,7 +146,7 @@ define(function(require) {
this.wizardTabId = WIZARD_TAB_ID + UniqueId.id();
this.icon = "fa-power-off";
this.title = Locale.tr("OS & CPU");
this.classes = "hypervisor only_kvm";
this.classes = "hypervisor"
this.kernelFilesTable = new FilesTable(
this.wizardTabId + UniqueId.id(),

16
src/sunstone/public/app/tabs/templates-tab/form-panels/create/wizard-tabs/os/html.hbs
View File

@ -19,16 +19,16 @@
<li class="tabs-title is-active">
<a href="#bootTab{{uniqueId}}">{{tr "Boot"}}</a>
</li>
<li class="tabs-title vm_updateconf_hide">
<li class="tabs-title vm_updateconf_hide only_kvm">
<a href="#kernelTab{{uniqueId}}">{{tr "Kernel"}}</a>
</li>
<li class="tabs-title vm_updateconf_hide">
<li class="tabs-title vm_updateconf_hide only_kvm">
<a href="#ramdiskTab{{uniqueId}}">{{tr "Ramdisk"}}</a>
</li>
<li class="tabs-title">
<li class="tabs-title only_kvm">
<a href="#featuresTab{{uniqueId}}">{{tr "Features"}}</a>
</li>
<li class="tabs-title">
<li class="tabs-title only_kvm">
<a href="#cpuTab{{uniqueId}}">{{tr "CPU Model"}}</a>
</li>
</ul>
@ -37,7 +37,7 @@
<div class="tabs-content vertical" data-tabs-content="osTabs">
<div class="wizard_internal_tab is-active tabs-panel bootTab" id="bootTab{{uniqueId}}">
<div class="row">
<div class="medium-4 columns">
<div class="medium-4 columns only_kvm">
<label>
{{tr "CPU Architecture"}}
<select wizard_field="ARCH">
@ -54,7 +54,7 @@
</div>
</div>
<div class="row">
<div class="medium-4 columns">
<div class="medium-4 columns only_kvm">
<label>
{{tr "Root device"}}
<input type="text" wizard_field="ROOT" placeholder="sda1"/>
@ -75,7 +75,7 @@
</div>
<br/>
<div class="row">
<div class="large-12 columns">
<div class="large-12 columns only_kvm">
<label>
{{tr "Kernel boot parameters"}}
<input type="text" wizard_field="KERNEL_CMD" placeholder="ro console=tty1"/>
@ -83,7 +83,7 @@
</div>
</div>
<div class="row">
<div class="large-12 columns">
<div class="large-12 columns only_kvm">
<label>
{{tr "Path to the bootloader executable"}}
<input type="text" wizard_field="BOOTLOADER"/>