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

Feature #3987: Add ceph_conf input, allow ceph system DS

Browse Source
This commit is contained in:
Carlos Martín 2015-11-05 17:04:52 +01:00
parent e809611707
commit a802856408
2 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -191,6 +191,7 @@ define(function(require) {
var ceph_user = $('#ceph_user', dialog).val();
var rbd_format = $('#rbd_format', dialog).val();
var staging_dir = $('#staging_dir', dialog).val();
var ceph_conf = $('#ceph_conf', dialog).val();
var ds_obj = {
"datastore" : {
@ -261,6 +262,9 @@ define(function(require) {
if (staging_dir)
ds_obj.datastore.staging_dir = staging_dir;
if (ceph_conf)
ds_obj.datastore.ceph_conf = ceph_conf;
Sunstone.runAction("Datastore.create", ds_obj);
return false;
}
@ -303,6 +307,7 @@ define(function(require) {
$('label[for="ceph_user"],input#ceph_user', dialog).parent().hide();
$('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="limit_transfer_bw"],input#limit_transfer_bw', dialog).parent().hide();
$('label[for="no_decompress"],input#no_decompress', dialog).parent().hide();
$('select#ds_mad', dialog).removeAttr('disabled');
@ -366,7 +371,7 @@ define(function(require) {
function _selectCeph(dialog) {
$('input#image_ds_type', dialog).click();
$('input[name=ds_type]', dialog).attr('disabled', 'disabled');
$('input#file_ds_type', dialog).attr('disabled', 'disabled');
$('select#ds_mad', dialog).val('ceph');
$('select#ds_mad', dialog).attr('disabled', 'disabled');
$('select#tm_mad', dialog).val('ceph');
@ -378,6 +383,7 @@ define(function(require) {
$('label[for="ceph_user"],input#ceph_user', dialog).parent().fadeIn();
$('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="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();

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

@ -258,5 +258,14 @@
</label>
<input type="text" name="rbd_format" id="rbd_format" />
</div>
<div class="medium-6 columns">
<label class="fs" for="ceph_conf">
{{tr "Ceph Conf File"}}
<span class="tip">
{{tr "Path to the ceph configuration file. Only necessary if not using the default configuration file."}}
</span>
</label>
<input type="text" name="ceph_conf" id="ceph_conf" />
</div>
</div>
</form>