etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

CLOUDSTACK-2351: object store - UI - infrastructure menu - secondary storage 

- Add Secondary Storage - when provider is S3, show option to create NFS cache storage.
This commit is contained in:
Jessica Wang 2013-05-09 17:48:00 -07:00
parent 292e77b96b
commit 1e539e81e3
1 changed files with 64 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

67
ui/scripts/system.js
View File

@ -10380,7 +10380,11 @@
$form.find('.form-item[rel=connectiontimeout]').hide();
$form.find('.form-item[rel=maxerrorretry]').hide();
$form.find('.form-item[rel=sockettimeout]').hide();
$form.find('.form-item[rel=createNfsCache]').hide();
$form.find('.form-item[rel=nfsCacheZoneid]').hide();
$form.find('.form-item[rel=nfsCacheNfsServer]').hide();
$form.find('.form-item[rel=nfsCachePath]').hide();
//Swift
$form.find('.form-item[rel=url]').hide();
$form.find('.form-item[rel=account]').hide();
@ -10401,7 +10405,14 @@
$form.find('.form-item[rel=usehttps]').css('display', 'inline-block');
$form.find('.form-item[rel=connectiontimeout]').css('display', 'inline-block');
$form.find('.form-item[rel=maxerrorretry]').css('display', 'inline-block');
$form.find('.form-item[rel=sockettimeout]').css('display', 'inline-block');
$form.find('.form-item[rel=sockettimeout]').css('display', 'inline-block');
$form.find('.form-item[rel=createNfsCache]').find('input').attr('checked','checked');
$form.find('.form-item[rel=createNfsCache]').css('display', 'inline-block');
$form.find('.form-item[rel=nfsCacheZoneid]').css('display', 'inline-block');
$form.find('.form-item[rel=nfsCacheNfsServer]').css('display', 'inline-block');
$form.find('.form-item[rel=nfsCachePath]').css('display', 'inline-block');
//Swift
$form.find('.form-item[rel=url]').hide();
@ -10424,7 +10435,11 @@
$form.find('.form-item[rel=connectiontimeout]').hide();
$form.find('.form-item[rel=maxerrorretry]').hide();
$form.find('.form-item[rel=sockettimeout]').hide();
$form.find('.form-item[rel=createNfsCache]').hide();
$form.find('.form-item[rel=nfsCacheZoneid]').hide();
$form.find('.form-item[rel=nfsCacheNfsServer]').hide();
$form.find('.form-item[rel=nfsCachePath]').hide();
//Swift
$form.find('.form-item[rel=url]').css('display', 'inline-block');
$form.find('.form-item[rel=account]').css('display', 'inline-block');
@ -10499,6 +10514,52 @@
connectiontimeout: { label: 'label.s3.connection_timeout' },
maxerrorretry: { label: 'label.s3.max_error_retry' },
sockettimeout: { label: 'label.s3.socket_timeout' },
createNfsCache: {
label: 'Create NFS Cache Storage',
isBoolean: true,
isChecked: true
},
nfsCacheZoneid: {
dependsOn: 'createNfsCache',
label: 'Zone',
validation: { required: true },
select: function(args) {
$.ajax({
url: createURL('listZones'),
data: {
listAll: true
},
success: function(json) {
var zones = json.listzonesresponse.zone;
if(zones != null){ //$.map(items, fn) - items can not be null
args.response.success({
data: $.map(zones, function(zone) {
return {
id: zone.id,
description: zone.name
};
})
});
}
else {
args.response.success({data: null});
}
}
});
}
},
nfsCacheNfsServer: {
dependsOn: 'createNfsCache',
label: 'label.nfs.server',
validation: { required: true }
},
nfsCachePath: {
dependsOn: 'createNfsCache',
label: 'label.path',
validation: { required: true }
},
//S3 (end)