Return-Path: X-Original-To: apmail-cloudstack-commits-archive@www.apache.org Delivered-To: apmail-cloudstack-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 4E1681007C for ; Fri, 2 Jan 2015 14:35:53 +0000 (UTC) Received: (qmail 53407 invoked by uid 500); 2 Jan 2015 14:35:53 -0000 Delivered-To: apmail-cloudstack-commits-archive@cloudstack.apache.org Received: (qmail 53357 invoked by uid 500); 2 Jan 2015 14:35:53 -0000 Mailing-List: contact commits-help@cloudstack.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cloudstack.apache.org Delivered-To: mailing list commits@cloudstack.apache.org Received: (qmail 53344 invoked by uid 99); 2 Jan 2015 14:35:53 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 02 Jan 2015 14:35:53 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 347FFA3C651; Fri, 2 Jan 2015 14:35:53 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: widodh@apache.org To: commits@cloudstack.apache.org Date: Fri, 02 Jan 2015 14:35:53 -0000 Message-Id: <5c56ac3fb2b34819ac40b6562dbc4d9c@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [01/50] [abbrv] git commit: updated refs/heads/reporter to b26f3fc Repository: cloudstack Updated Branches: refs/heads/reporter 74f4d8248 -> b26f3fcb0 (forced update) 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/923c65d7 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/923c65d7 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/923c65d7 Branch: refs/heads/reporter Commit: 923c65d7ce791e86d2e949a9d55bfc666bda1cfe Parents: ad258cc Author: Jessica Wang Authored: Thu Dec 18 18:13:14 2014 -0800 Committer: Jessica Wang Committed: Thu Dec 18 18:15:06 2014 -0800 ---------------------------------------------------------------------- ui/scripts/zoneWizard.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/923c65d7/ui/scripts/zoneWizard.js ---------------------------------------------------------------------- diff --git a/ui/scripts/zoneWizard.js b/ui/scripts/zoneWizard.js index 32ffb9d..13bc3ab 100755 --- a/ui/scripts/zoneWizard.js +++ b/ui/scripts/zoneWizard.js @@ -597,7 +597,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