cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From wid...@apache.org
Subject [01/50] [abbrv] git commit: updated refs/heads/reporter to b26f3fc
Date Fri, 02 Jan 2015 14:35:53 GMT
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 <jessicawang@apache.org>
Authored: Thu Dec 18 18:13:14 2014 -0800
Committer: Jessica Wang <jessicawang@apache.org>
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


Mime
View raw message