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/27 20:41:21 UTC
git commit: updated refs/heads/master to af8e83b
Repository: cloudstack
Updated Branches:
refs/heads/master 7bc7377a1 -> af8e83b41
CLOUDSTACK-6744 > UI > zone wizard > baremetal hypervisor > support EIP ELB feature.
This reverts commit d36c731f795e3d709d830c58936accfadc4277d8.
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/af8e83b4
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/af8e83b4
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/af8e83b4
Branch: refs/heads/master
Commit: af8e83b410f7698e736b68cdd065d4ab11958e24
Parents: 7bc7377
Author: Jessica Wang <je...@apache.org>
Authored: Tue May 27 11:40:51 2014 -0700
Committer: Jessica Wang <je...@apache.org>
Committed: Tue May 27 11:41:11 2014 -0700
----------------------------------------------------------------------
ui/scripts/zoneWizard.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/af8e83b4/ui/scripts/zoneWizard.js
----------------------------------------------------------------------
diff --git a/ui/scripts/zoneWizard.js b/ui/scripts/zoneWizard.js
index a6321cf..0a84bdb 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") { //VMware does not support EIP ELB
+ if (args.hypervisor == "VMware" || args.hypervisor == "BareMetal") { //VMware, BareMetal don't 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