Revision 3e0440e2

View differences:

src/sunstone/public/app/tabs/datastores-tab/form-panels/create.js
231 231
    var no_decompress   = $('#no_decompress', dialog).is(':checked');
232 232

  
233 233
    var bridge_list     = $('#bridge_list', dialog).val();
234
    var ds_tmp_dir     = $('#ds_tmp_dir', dialog).val();
234
    var ds_tmp_dir      = $('#ds_tmp_dir', dialog).val();
235 235
    var vg_name         = $('#vg_name', dialog).val();
236 236
    var limit_mb        = $('#limit_mb', dialog).val();
237 237
    var gluster_host    = $('#gluster_host', dialog).val();
......
243 243
    var rbd_format      = $('#rbd_format', dialog).val();
244 244
    var staging_dir     = $('#staging_dir', dialog).val();
245 245
    var ceph_conf       = $('#ceph_conf', dialog).val();
246
    var ceph_key        = $('#ceph_key', dialog).val();
246 247
    var iscsi_host      = $('#iscsi_host', dialog).val();
247 248
    var iscsi_user      = $('#iscsi_user', dialog).val();
248 249
    var iscsi_usage     = $('#iscsi_usage', dialog).val();
......
317 318
    if (ceph_conf)
318 319
        ds_obj.datastore.ceph_conf = ceph_conf;
319 320

  
321
    if (ceph_key)
322
        ds_obj.datastore.ceph_key = ceph_key;
323

  
320 324
    if (iscsi_host)
321 325
        ds_obj.datastore.iscsi_host = iscsi_host;
322 326

  
......
370 374
    $('label[for="rbd_format"],input#rbd_format', dialog).parent().hide();
371 375
    $('label[for="staging_dir"],input#staging_dir', dialog).parent().hide();
372 376
    $('label[for="ceph_conf"],input#ceph_conf', dialog).parent().hide();
377
    $('label[for="ceph_key"],input#ceph_key', dialog).parent().hide();
373 378
    $('label[for="iscsi_host"],input#iscsi_host', dialog).parent().hide();
374 379
    $('label[for="iscsi_user"],input#iscsi_user', dialog).parent().hide();
375 380
    $('label[for="iscsi_usage"],input#iscsi_usage', dialog).parent().hide();
......
398 403
    $('label[for="rbd_format"],input#rbd_format', dialog).parent().show();
399 404
    $('label[for="staging_dir"],input#staging_dir', dialog).parent().show();
400 405
    $('label[for="ceph_conf"],input#ceph_conf', dialog).parent().show();
406
    $('label[for="ceph_key"],input#ceph_key', dialog).parent().show();
401 407
    $('label[for="iscsi_host"],input#iscsi_host', dialog).parent().show();
402 408
    $('label[for="iscsi_user"],input#iscsi_user', dialog).parent().show();
403 409
    $('label[for="iscsi_usage"],input#iscsi_usage', dialog).parent().show();
......
449 455
    $('label[for="rbd_format"],input#rbd_format', dialog).parent().fadeIn();
450 456
    $('label[for="staging_dir"],input#staging_dir', dialog).parent().fadeIn();
451 457
    $('label[for="ceph_conf"],input#ceph_conf', dialog).parent().fadeIn();
458
    $('label[for="ceph_key"],input#ceph_key', dialog).parent().fadeIn();
452 459
    $('label[for="limit_transfer_bw"],input#limit_transfer_bw', dialog).parent().fadeIn();
453 460
    $('label[for="no_decompress"],input#no_decompress', dialog).parent().fadeIn();
454 461
    $('label[for="datastore_capacity_check"],input#datastore_capacity_check', dialog).parent().fadeIn();
src/sunstone/public/app/tabs/datastores-tab/form-panels/create/wizard.hbs
209 209
      <input type="text" name="ceph_secret" id="ceph_secret" />
210 210
    </div>
211 211
    <div class="medium-6 columns">
212
      <label class="fs" for="staging_dir">
213
        {{tr "Staging directory for Image registration"}}
214
      </label>
215
      <input type="text" name="staging_dir" id="staging_dir" />
216
    </div>
217
    <div class="medium-6 columns">
218
      <label for="rbd_format">
219
        {{tr "RBD format"}}
220
      </label>
221
      <input type="text" name="rbd_format" id="rbd_format" />
222
    </div>
223
    <div class="medium-6 columns">
224
      <label class="fs" for="ceph_conf">
225
        {{tr "Ceph configuration file path"}}
226
        <span class="tip">
227
          {{tr "Needed if using a non-default path for the ceph configuration file."}}
228
        </span>
229
      </label>
230
      <input type="text" name="ceph_conf" id="ceph_conf" />
231
    </div>
232
    <div class="medium-6 columns">
233 212
      <label for="iscsi_host">
234 213
        {{tr "iSCSI host"}}
235 214
        <span class="tip">
......
263 242
      </label>
264 243
    </div>
265 244
  </div>
245
  <div class="ceph_advanced">
246
    {{#advancedSection (tr "Advanced options") }}
247
    <div class="medium-6 columns">
248
      <label class="fs" for="staging_dir">
249
        {{tr "Staging directory for Image registration"}}
250
      </label>
251
      <input type="text" name="staging_dir" id="staging_dir" />
252
    </div>
253
    <div class="medium-6 columns">
254
      <label for="rbd_format">
255
        {{tr "RBD format"}}
256
      </label>
257
      <input type="text" name="rbd_format" id="rbd_format" />
258
    </div>
259
    <div class="medium-6 columns">
260
      <label class="fs" for="ceph_conf">
261
        {{tr "Ceph configuration file path"}}
262
        <span class="tip">
263
          {{tr "Needed if using a non-default path for the ceph configuration file."}}
264
        </span>
265
      </label>
266
      <input type="text" name="ceph_conf" id="ceph_conf" />
267
    </div>
268
    <div class="medium-6 columns">
269
      <label class="fs" for="ceph_key">
270
        {{tr "Ceph keyfile"}}
271
        <span class="tip">
272
          {{tr "File containing the secret key of user."}}
273
        </span>
274
      </label>
275
      <input type="text" name="ceph_key" id="ceph_key" />
276
    </div>
277
    {{/advancedSection}}
278
  </div>
266 279
</form>

Also available in: Unified diff