Updated Branches: refs/heads/master a8efbcda5 -> 86d49e7aa
CS-16060: Firewall service should be excluded from conserve mode checking Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/86d49e7a Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/86d49e7a Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/86d49e7a Branch: refs/heads/master Commit: 86d49e7aa022ebf50e5e4e5af90b8b9d6e3936c8 Parents: a8efbcd Author: Sheng Yang <[email protected]> Authored: Fri Aug 17 10:54:20 2012 -0700 Committer: Sheng Yang <[email protected]> Committed: Fri Aug 17 17:05:04 2012 -0700 ---------------------------------------------------------------------- .../src/com/cloud/network/NetworkManagerImpl.java | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/86d49e7a/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 baf44df..210ec0d 100755 --- a/server/src/com/cloud/network/NetworkManagerImpl.java +++ b/server/src/com/cloud/network/NetworkManagerImpl.java @@ -880,6 +880,9 @@ public class NetworkManagerImpl implements NetworkManager, NetworkService, Manag if (!offering.isConserveMode()) { for (PublicIp ip : ipToServices.keySet()) { Set<Service> services = ipToServices.get(ip); + if (services != null && services.contains(Service.Firewall)) { + services.remove(Service.Firewall); + } if (services != null && services.size() > 1) { throw new CloudRuntimeException("Ip " + ip.getAddress() + " is used by multiple services!"); }
