Repository: cloudstack Updated Branches: refs/heads/master 0403a3522 -> ce4ea45ce
CLOUDSTACK-9229: Autoscale policy creation failing in VPC due to zoneid missing in createAutoScaleVmProfile Added a conditon to check whether the zoneid in networks is undefined, If that is undefined, it gets the zoneid from ipaddresses argument. Fixed a localization issue. Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/8e778151 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/8e778151 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/8e778151 Branch: refs/heads/master Commit: 8e778151e1cc6064ea46b457be266a8ec3afc7d7 Parents: 80703ca Author: Nitin Kumar Maharana <[email protected]> Authored: Thu Jan 7 16:57:54 2016 +0530 Committer: Nitin Kumar Maharana <[email protected]> Committed: Wed Jan 13 15:47:06 2016 +0530 ---------------------------------------------------------------------- ui/scripts/autoscaler.js | 2 +- ui/scripts/ui-custom/autoscaler.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/8e778151/ui/scripts/autoscaler.js ---------------------------------------------------------------------- diff --git a/ui/scripts/autoscaler.js b/ui/scripts/autoscaler.js index bbd6d9a..e8ac044 100644 --- a/ui/scripts/autoscaler.js +++ b/ui/scripts/autoscaler.js @@ -1116,7 +1116,7 @@ var apiCmd, apiCmdRes; if (!('multiRules' in args.context)) { //from a new LB var data = { - zoneid: args.context.networks[0].zoneid, //get zoneid from args.context.networks[0] instead of args.context.ipAddresses[0] because args.context.ipAddresses is null when adding AutoScale rule from Add Load Balancer tab in Network page + zoneid: args.context.networks[0].zoneid ? args.context.networks[0].zoneid : args.context.ipAddresses[0].zoneid, //get zoneid from args.context.networks[0]. If it is not null then get it from args.context.ipAddresses[0] because args.context.ipAddresses is null when adding AutoScale rule from Add Load Balancer tab in Network page serviceofferingid: args.data.serviceOfferingId, templateid: args.data.templateNames, destroyvmgraceperiod: args.data.destroyVMgracePeriod, http://git-wip-us.apache.org/repos/asf/cloudstack/blob/8e778151/ui/scripts/ui-custom/autoscaler.js ---------------------------------------------------------------------- diff --git a/ui/scripts/ui-custom/autoscaler.js b/ui/scripts/ui-custom/autoscaler.js index ca37bea..52eb5ea 100644 --- a/ui/scripts/ui-custom/autoscaler.js +++ b/ui/scripts/ui-custom/autoscaler.js @@ -333,7 +333,7 @@ var $loading = $('<div>').addClass('loading-overlay').appendTo($autoscalerDialog); $autoscalerDialog.dialog({ - title: 'label.autoscale.configuration.wizard', + title: _l('label.autoscale.configuration.wizard'), width: 825, height: 600, draggable: true,
