cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From r...@apache.org
Subject git commit: updated refs/heads/4.4 to 3b3d2fc
Date Tue, 18 Aug 2015 09:19:23 GMT
Repository: cloudstack
Updated Branches:
  refs/heads/4.4 cf558be0f -> 3b3d2fc9d


CLOUDSTACK-8709 No out of band migrate alert for non-routers

(cherry picked from commit daa30c472201e69c4f932ab504352e195b535199)
Signed-off-by: Remi Bergsma <github@remi.nl>


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/3b3d2fc9
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/3b3d2fc9
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/3b3d2fc9

Branch: refs/heads/4.4
Commit: 3b3d2fc9d4dc068d42c6f63132518d9702cfb5d9
Parents: cf558be
Author: Remi Bergsma <github@remi.nl>
Authored: Fri Aug 7 13:55:36 2015 +0200
Committer: Remi Bergsma <github@remi.nl>
Committed: Tue Aug 18 11:17:06 2015 +0200

----------------------------------------------------------------------
 .../cloud/network/router/VirtualNetworkApplianceManagerImpl.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/3b3d2fc9/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java b/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
index fce1ad4..5751fba 100755
--- a/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
+++ b/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
@@ -4407,7 +4407,7 @@ public class VirtualNetworkApplianceManagerImpl extends ManagerBase
implements V
                 s_logger.info("Schedule a router reboot task as router " + vo.getId() + "
is powered-on out-of-band. we need to reboot to refresh network rules");
                 _executor.schedule(new RebootTask(vo.getId()), 1000, TimeUnit.MICROSECONDS);
         } else {
-            if (isOutOfBandMigrated(opaque)) {
+            if (isOutOfBandMigrated(opaque) && (vo.getType() == VirtualMachine.Type.DomainRouter))
{
                 final String title = "Router has been migrated out of band: " + vo.getInstanceName();
                 final String context =
                         "An out of band migration of router " + vo.getInstanceName() + "("
+ vo.getUuid() + ") was detected. No automated action was performed.";


Mime
View raw message