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/12/19 03:14:07 UTC
git commit: updated refs/heads/4.5 to 65c742c
Repository: cloudstack
Updated Branches:
refs/heads/4.5 27295d235 -> 65c742cd6
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/65c742cd
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/65c742cd
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/65c742cd
Branch: refs/heads/4.5
Commit: 65c742cd66e032c91a6e12e9eae4343c7f18965f
Parents: 27295d2
Author: Jessica Wang <je...@apache.org>
Authored: Thu Dec 18 18:13:14 2014 -0800
Committer: Jessica Wang <je...@apache.org>
Committed: Thu Dec 18 18:13:14 2014 -0800
----------------------------------------------------------------------
ui/scripts/zoneWizard.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/65c742cd/ui/scripts/zoneWizard.js
----------------------------------------------------------------------
diff --git a/ui/scripts/zoneWizard.js b/ui/scripts/zoneWizard.js
index 4ce4efb..66b3469 100755
--- a/ui/scripts/zoneWizard.js
+++ b/ui/scripts/zoneWizard.js
@@ -577,7 +577,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