From af8e83b410f7698e736b68cdd065d4ab11958e24 Mon Sep 17 00:00:00 2001 From: Jessica Wang Date: Tue, 27 May 2014 11:40:51 -0700 Subject: [PATCH] CLOUDSTACK-6744 > UI > zone wizard > baremetal hypervisor > support EIP ELB feature. This reverts commit d36c731f795e3d709d830c58936accfadc4277d8. --- ui/scripts/zoneWizard.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ui/scripts/zoneWizard.js b/ui/scripts/zoneWizard.js index a6321cf8099..0a84bdb9bc8 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