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

Added advanced options and ceph_keyfile input in create ceph datastore

Browse Source
This commit is contained in:
abelCoronado93 2017-07-05 12:36:26 +02:00 committed by Tino Vázquez
parent 38bb26094a
commit 3e0440e24a
2 changed files with 42 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/sunstone/public/app/tabs/datastores-tab/form-panels/create.js
View File

@ -231,7 +231,7 @@ define(function(require) {
var no_decompress = $('#no_decompress', dialog).is(':checked');
var bridge_list = $('#bridge_list', dialog).val();
var ds_tmp_dir = $('#ds_tmp_dir', dialog).val();
var ds_tmp_dir = $('#ds_tmp_dir', dialog).val();
var vg_name = $('#vg_name', dialog).val();
var limit_mb = $('#limit_mb', dialog).val();
var gluster_host = $('#gluster_host', dialog).val();
@ -243,6 +243,7 @@ define(function(require) {
var rbd_format = $('#rbd_format', dialog).val();
var staging_dir = $('#staging_dir', dialog).val();
var ceph_conf = $('#ceph_conf', dialog).val();
var ceph_key = $('#ceph_key', dialog).val();
var iscsi_host = $('#iscsi_host', dialog).val();
var iscsi_user = $('#iscsi_user', dialog).val();
var iscsi_usage = $('#iscsi_usage', dialog).val();
@ -317,6 +318,9 @@ define(function(require) {
if (ceph_conf)
ds_obj.datastore.ceph_conf = ceph_conf;
if (ceph_key)
ds_obj.datastore.ceph_key = ceph_key;
if (iscsi_host)
ds_obj.datastore.iscsi_host = iscsi_host;
@ -370,6 +374,7 @@ define(function(require) {
$('label[for="rbd_format"],input#rbd_format', dialog).parent().hide();
$('label[for="staging_dir"],input#staging_dir', dialog).parent().hide();
$('label[for="ceph_conf"],input#ceph_conf', dialog).parent().hide();
$('label[for="ceph_key"],input#ceph_key', dialog).parent().hide();
$('label[for="iscsi_host"],input#iscsi_host', dialog).parent().hide();
$('label[for="iscsi_user"],input#iscsi_user', dialog).parent().hide();
$('label[for="iscsi_usage"],input#iscsi_usage', dialog).parent().hide();
@ -398,6 +403,7 @@ define(function(require) {
$('label[for="rbd_format"],input#rbd_format', dialog).parent().show();
$('label[for="staging_dir"],input#staging_dir', dialog).parent().show();
$('label[for="ceph_conf"],input#ceph_conf', dialog).parent().show();
$('label[for="ceph_key"],input#ceph_key', dialog).parent().show();
$('label[for="iscsi_host"],input#iscsi_host', dialog).parent().show();
$('label[for="iscsi_user"],input#iscsi_user', dialog).parent().show();
$('label[for="iscsi_usage"],input#iscsi_usage', dialog).parent().show();
@ -449,6 +455,7 @@ define(function(require) {
$('label[for="rbd_format"],input#rbd_format', dialog).parent().fadeIn();
$('label[for="staging_dir"],input#staging_dir', dialog).parent().fadeIn();
$('label[for="ceph_conf"],input#ceph_conf', dialog).parent().fadeIn();
$('label[for="ceph_key"],input#ceph_key', dialog).parent().fadeIn();
$('label[for="limit_transfer_bw"],input#limit_transfer_bw', dialog).parent().fadeIn();
$('label[for="no_decompress"],input#no_decompress', dialog).parent().fadeIn();
$('label[for="datastore_capacity_check"],input#datastore_capacity_check', dialog).parent().fadeIn();

55
src/sunstone/public/app/tabs/datastores-tab/form-panels/create/wizard.hbs
View File

@ -208,27 +208,6 @@
</label>
<input type="text" name="ceph_secret" id="ceph_secret" />
</div>
<div class="medium-6 columns">
<label class="fs" for="staging_dir">
{{tr "Staging directory for Image registration"}}
</label>
<input type="text" name="staging_dir" id="staging_dir" />
</div>
<div class="medium-6 columns">
<label for="rbd_format">
{{tr "RBD format"}}
</label>
<input type="text" name="rbd_format" id="rbd_format" />
</div>
<div class="medium-6 columns">
<label class="fs" for="ceph_conf">
{{tr "Ceph configuration file path"}}
<span class="tip">
{{tr "Needed if using a non-default path for the ceph configuration file."}}
</span>
</label>
<input type="text" name="ceph_conf" id="ceph_conf" />
</div>
<div class="medium-6 columns">
<label for="iscsi_host">
{{tr "iSCSI host"}}
@ -263,4 +242,38 @@
</label>
</div>
</div>
<div class="ceph_advanced">
{{#advancedSection (tr "Advanced options") }}
<div class="medium-6 columns">
<label class="fs" for="staging_dir">
{{tr "Staging directory for Image registration"}}
</label>
<input type="text" name="staging_dir" id="staging_dir" />
</div>
<div class="medium-6 columns">
<label for="rbd_format">
{{tr "RBD format"}}
</label>
<input type="text" name="rbd_format" id="rbd_format" />
</div>
<div class="medium-6 columns">
<label class="fs" for="ceph_conf">
{{tr "Ceph configuration file path"}}
<span class="tip">
{{tr "Needed if using a non-default path for the ceph configuration file."}}
</span>
</label>
<input type="text" name="ceph_conf" id="ceph_conf" />
</div>
<div class="medium-6 columns">
<label class="fs" for="ceph_key">
{{tr "Ceph keyfile"}}
<span class="tip">
{{tr "File containing the secret key of user."}}
</span>
</label>
<input type="text" name="ceph_key" id="ceph_key" />
</div>
{{/advancedSection}}
</div>
</form>