Updated Branches:
refs/heads/4.2 30d4ef3af -> 242f46118
InternalLb: fixed creation for default network offering with internal lb
support - public lb support should be disbaled on it
Conflicts:
engine/schema/src/com/cloud/offerings/NetworkOfferingVO.java
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/242f4611
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/242f4611
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/242f4611
Branch: refs/heads/4.2
Commit: 242f46118bffb151553b701dcc8ae1c6bae65fd2
Parents: 30d4ef3
Author: Alena Prokharchyk <[email protected]>
Authored: Fri Jul 19 12:59:42 2013 -0700
Committer: Alena Prokharchyk <[email protected]>
Committed: Fri Jul 19 13:20:46 2013 -0700
----------------------------------------------------------------------
engine/schema/src/com/cloud/offerings/NetworkOfferingVO.java | 3 +++
server/src/com/cloud/network/NetworkManagerImpl.java | 1 +
2 files changed, 4 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/242f4611/engine/schema/src/com/cloud/offerings/NetworkOfferingVO.java
----------------------------------------------------------------------
diff --git a/engine/schema/src/com/cloud/offerings/NetworkOfferingVO.java
b/engine/schema/src/com/cloud/offerings/NetworkOfferingVO.java
index 6317f72..f21136e 100755
--- a/engine/schema/src/com/cloud/offerings/NetworkOfferingVO.java
+++ b/engine/schema/src/com/cloud/offerings/NetworkOfferingVO.java
@@ -426,4 +426,7 @@ public class NetworkOfferingVO implements NetworkOffering {
this.internalLb = internalLb;
}
+ public void setPublicLb(boolean publicLb) {
+ this.publicLb = publicLb;
+ }
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/242f4611/server/src/com/cloud/network/NetworkManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/network/NetworkManagerImpl.java
b/server/src/com/cloud/network/NetworkManagerImpl.java
index 736f2a1..8368f95 100755
--- a/server/src/com/cloud/network/NetworkManagerImpl.java
+++ b/server/src/com/cloud/network/NetworkManagerImpl.java
@@ -1428,6 +1428,7 @@ public class NetworkManagerImpl extends ManagerBase
implements NetworkManager, L
true, Network.GuestType.Isolated, false, null, false,
null, false, false, null, false);
offering.setState(NetworkOffering.State.Enabled);
offering.setInternalLb(true);
+ offering.setPublicLb(false);
_networkOfferingDao.update(offering.getId(), offering);
}
