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

Feature #4445: Enable IP selection on VM instantiate

Browse Source
This commit is contained in:
Carlos Martín 2016-05-06 16:26:09 +02:00
parent c3f526e501
commit dc8ae9717d
2 changed files with 20 additions and 24 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/instantiate.js
View File

@ -206,7 +206,9 @@ define(function(require) {
NicsSection.insert(template_json,
$(".nicsContext" + template_json.VMTEMPLATE.ID, context),
{'securityGroups': Config.isFeatureEnabled("secgroups")});
{ 'forceIPv4': true,
'securityGroups': Config.isFeatureEnabled("secgroups")
});
var inputs_div = $(".template_user_inputs" + template_json.VMTEMPLATE.ID, context);

40
src/sunstone/public/app/utils/nics-section/dd.hbs
View File

@ -20,24 +20,20 @@
<div class="row collapse">
{{{vnetsTableHTML}}}
</div>
{{#if options.forceIPv4}}
<div class="row">
<div class="small-5 columns">
<label class="right inline">
{{tr "Force IPv4:"}}
<span class="tip">
{{tr "Optionally, you can force the IP assigned to the network interface."}}
</span>
</label>
</div>
<div class="small-7 columns">
<input type="text" class="manual_ip4" />
</div>
</div>
{{/if}}
{{#if options.floatingIP}}
<div class="row">
<div class="small-12 columns">
{{#if options.forceIPv4}}
<div class="medium-6 columns">
<label>
{{tr "Force IPv4:"}}
<span class="tip">
{{tr "Optionally, you can force the IP assigned to the network interface."}}
</span>
<input type="text" class="manual_ip4" />
</label>
</div>
{{/if}}
{{#if options.floatingIP}}
<div class="medium-6 columns">
<label class="inline">
<input type="checkbox" class="floating_ip" />
{{tr "Floating IP"}}
@ -46,11 +42,9 @@
</span>
</label>
</div>
</div>
{{/if}}
{{#if options.management}}
<div class="row">
<div class="small-12 columns">
{{/if}}
{{#if options.management}}
<div class="medium-6 columns">
<label>
<input type="checkbox" class="management" />
{{tr "Management Interface"}}
@ -59,8 +53,8 @@
</span>
</label>
</div>
{{/if}}
</div>
{{/if}}
{{#if options.securityGroups}}
<div class="row collapse">
<h6>