diff --git a/src/sunstone/public/app/sunstone-config.js b/src/sunstone/public/app/sunstone-config.js index ebb8380a91..344ea28d7f 100644 --- a/src/sunstone/public/app/sunstone-config.js +++ b/src/sunstone/public/app/sunstone-config.js @@ -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); } diff --git a/src/sunstone/sunstone-server.rb b/src/sunstone/sunstone-server.rb index af8065cb38..11ea98e39f 100755 --- a/src/sunstone/sunstone-server.rb +++ b/src/sunstone/sunstone-server.rb @@ -528,6 +528,7 @@ get '/onedconf' do keys = [ :DEFAULT_COST, :DS_MAD_CONF, + :MARKET_MAD_CONF, :VM_MAD, :IM_MAD, :AUTH_MAD