You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by je...@apache.org on 2014/05/22 02:22:25 UTC
git commit: updated refs/heads/master to d36c731
Repository: cloudstack
Updated Branches:
refs/heads/master 09ec12747 -> d36c731f7
CLOUDSTACK-6744 > UI > zone wizard > baremetal hypervisor > support EIP ELB feature.
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/d36c731f
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/d36c731f
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/d36c731f
Branch: refs/heads/master
Commit: d36c731f795e3d709d830c58936accfadc4277d8
Parents: 09ec127
Author: Jessica Wang <je...@apache.org>
Authored: Wed May 21 17:17:20 2014 -0700
Committer: Jessica Wang <je...@apache.org>
Committed: Wed May 21 17:22:15 2014 -0700
----------------------------------------------------------------------
ui/scripts/zoneWizard.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d36c731f/ui/scripts/zoneWizard.js
----------------------------------------------------------------------
diff --git a/ui/scripts/zoneWizard.js b/ui/scripts/zoneWizard.js
index 0a84bdb..a6321cf 100755
--- a/ui/scripts/zoneWizard.js
+++ b/ui/scripts/zoneWizard.js
@@ -574,7 +574,7 @@
});
if (thisNetworkOffering.havingEIP == true && thisNetworkOffering.havingELB == true) { //EIP ELB
- if (args.hypervisor == "VMware" || args.hypervisor == "BareMetal") { //VMware, BareMetal don't support EIP ELB
+ if (args.hypervisor == "VMware") { //VMware does not support EIP ELB
return true; //move to next item in $.each() loop
}
if (args.context.zones[0]["network-model"] == "Advanced" && args.context.zones[0]["zone-advanced-sg-enabled"] == "on") { // Advanced SG-enabled zone doesn't support EIP ELB