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 #4217: Add DS_MAD_CONF to Sunstone

Browse Source
This commit is contained in:
Daniel Molina 2016-02-08 16:36:50 +01:00
parent 6785e0fe02
commit fcd3206a26
2 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/sunstone/public/app/sunstone-config.js
View File

@ -31,6 +31,7 @@ define(function(require) {
var _imMadConf = {};
var _vmMadConf = {};
var _authMadConf = {};
var _marketMadConf = {};
var Config = {
'isTabEnabled': function(tabName) {
@ -161,6 +162,7 @@ define(function(require) {
'imMadConf' : _imMadConf,
'vmMadConf' : _vmMadConf,
'authMadConf' : _authMadConf,
'marketMadConf' : _marketMadConf,
"initOnedConf" : function() {
OpenNebulaSystem.onedconf({
data : {},
@ -182,6 +184,10 @@ define(function(require) {
$.extend(true, _dsMadConf, onedconf.DS_MAD_CONF);
}
if (onedconf.MARKET_MAD_CONF != undefined){
$.extend(true, _marketMadConf, onedconf.MARKET_MAD_CONF);
}
if (onedconf.IM_MAD != undefined){
$.extend(true, _imMadConf, onedconf.IM_MAD);
}

1
src/sunstone/sunstone-server.rb
View File

@ -528,6 +528,7 @@ get '/onedconf' do
keys = [
:DEFAULT_COST,
:DS_MAD_CONF,
:MARKET_MAD_CONF,
:VM_MAD,
:IM_MAD,
:AUTH_MAD