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

F #2826: Changes for LXD support in Sunstone

Browse Source 
Remove unneeded options in LXD.
This commit is contained in:
Tino Vazquez 2019-02-11 19:15:18 +01:00
parent bff39b36f5
commit 58cd92910a
No known key found for this signature in database
GPG Key ID: 2FE9C32E94AEABBE
9 changed files with 23 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -211,6 +211,8 @@ define(function(require) {
if (this.value != "lxd")
{
$('.only_lxd').hide();
$('.not_lxd').show();
$('.raw_type').val('kvm');
}
}
// There is another listener in context.js setup
@ -221,6 +223,8 @@ define(function(require) {
if (this.value == "lxd"){
$('.only_lxd').show();
$('.not_lxd').hide();
$('.raw_type').val('lxd');
}
});

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

@ -120,7 +120,7 @@
</label>
<select id="lxd_security_privileged">
<option value="yes">Yes</option>
<option value="no">No</option>
<option selected="selected" value="no">No</option>
</select>
</div>
</div>
@ -131,7 +131,7 @@
</label>
<select id="lxd_security_nesting">
<option value="yes">Yes</option>
<option value="no">No</option>
<option selected="selected" value="no">No</option>
</select>
</div>
</div>

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

@ -24,9 +24,9 @@
<label for="radioNoneType{{uniqueId}}">{{tr "None"}}</label>
<input type="radio" wizard_field="TYPE" name="graphics_type" ID="radioVncType{{uniqueId}}" value="VNC" checked>
<label for="radioVncType{{uniqueId}}">VNC</label>
<input type="radio" wizard_field="TYPE" name="graphics_type" ID="radioSdlType{{uniqueId}}" value="SDL" class="hypervisor only_kvm" >
<input type="radio" wizard_field="TYPE" name="graphics_type" ID="radioSdlType{{uniqueId}}" value="SDL" class="hypervisor only_kvm not_lxd" >
<label class="hypervisor only_kvm" for="radioSdlType{{uniqueId}}">SDL</label>
<input type="radio" wizard_field="TYPE" name="graphics_type" ID="radioSpiceType{{uniqueId}}" value="SPICE" class="hypervisor only_kvm" >
<input type="radio" wizard_field="TYPE" name="graphics_type" ID="radioSpiceType{{uniqueId}}" value="SPICE" class="hypervisor only_kvm not_lxd" >
<label class="hypervisor only_kvm" for="radioSpiceType{{uniqueId}}">SPICE</label>
</div>
</div>

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

@ -33,7 +33,7 @@
<p><br/></p>
</div>
</div>
<div class="row">
<div class="row not_lxd">
<div class="medium-6 columns">
<label for="DEFAULT_MODEL">
{{tr "Default hardware model to emulate for all NICs"}}

2
src/sunstone/public/app/tabs/templates-tab/form-panels/create/wizard-tabs/network/nic-tab/html.hbs
View File

@ -286,7 +286,7 @@
</div>
</div>
<div class="row nic-model-row">
<div class="medium-6 columns">
<div class="medium-6 columns not_lxd">
<label for="MODEL">
{{tr "Hardware model to emulate"}}
</label>

8
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 only_kvm">
<li class="tabs-title vm_updateconf_hide only_kvm not_lxd">
<a href="#kernelTab{{uniqueId}}">{{tr "Kernel"}}</a>
</li>
<li class="tabs-title vm_updateconf_hide only_kvm">
<li class="tabs-title vm_updateconf_hide only_kvm not_lxd">
<a href="#ramdiskTab{{uniqueId}}">{{tr "Ramdisk"}}</a>
</li>
<li class="tabs-title only_kvm">
<li class="tabs-title only_kvm not_lxd">
<a href="#featuresTab{{uniqueId}}">{{tr "Features"}}</a>
</li>
<li class="tabs-title only_kvm">
<li class="tabs-title only_kvm not_lxd">
<a href="#cpuTab{{uniqueId}}">{{tr "CPU Model"}}</a>
</li>
</ul>

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

@ -23,7 +23,8 @@
<label>
{{tr "Type"}}
<select class="raw_type" disabled>
<option value="kvm">{{tr "kvm"}}</option>
<option selected="select" value="kvm">{{tr "kvm"}}</option>
<option value="lxd">{{tr "lxd"}}</option>
</select>
</label>
</div>

4
src/sunstone/public/app/tabs/templates-tab/form-panels/create/wizard-tabs/storage/disk-tab/html.hbs
View File

@ -18,8 +18,8 @@
<div class="large-12 columns">
<input id="{{diskTabId}}radioImage" type="radio" name="{{diskTabId}}" value="image" checked>
<label for="{{diskTabId}}radioImage">{{tr "Image"}}</label>
<input id="{{diskTabId}}radioVolatile" type="radio" name="{{diskTabId}}" value="volatile">
<label for="{{diskTabId}}radioVolatile">{{tr "Volatile disk"}}</label>
<input id="{{diskTabId}}radioVolatile" type="radio" name="{{diskTabId}}" value="volatile" class="not_lxd">
<label for="{{diskTabId}}radioVolatile" class="not_lxd">{{tr "Volatile disk"}}</label>
</div>
</div>
<div id="disk_type" class="image">

10
src/sunstone/public/app/tabs/templates-tab/form-panels/create/wizard-tabs/storage/disk-tab/options.hbs
View File

@ -2,7 +2,7 @@
<div class="medium-6 columns hypervisor only_kvm">
<label for="TARGET">
{{tr "Target device"}}
{{{tip (tr "Device to map image disk. If set, it will overwrite the default device mapping.")}}}
{{{tip (tr "Device to map image disk. If set, it will overwrite the default device mapping. In LXD this setting specifies a disk mount point like /mnt.")}}}
</label>
<input type="text" wizard_field="TARGET" id="TARGET" name="target" placeholder="sdc"/>
</div>
@ -21,7 +21,7 @@
</div>
</div>
<div class="row">
<div class="medium-6 columns hypervisor only_kvm">
<div class="medium-6 columns hypervisor only_kvm not_lxd">
<label>
{{tr "BUS"}}
<select id="disk_dev_prefix" name="disk_dev_prefix">
@ -72,7 +72,7 @@
</div>
</div>
<div class="row vm_param">
<div class="medium-6 columns hypervisor only_kvm">
<div class="medium-6 columns hypervisor only_kvm not_lxd">
<label for="CACHE">
{{tr "Cache"}}
</label>
@ -86,7 +86,7 @@
<option value="unsafe">unsafe</option>
</select>
</div>
<div class="medium-6 columns hypervisor only_kvm">
<div class="medium-6 columns hypervisor only_kvm not_lxd">
<label for="IO">
{{tr "IO policy"}}
</label>
@ -96,7 +96,7 @@
<option value="native">native</option>
</select>
</div>
<div class="medium-6 columns hypervisor only_kvm">
<div class="medium-6 columns hypervisor only_kvm not_lxd">
<label for="DISCARD">
{{tr "Discard"}}
</label>