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.5 to b655104
Date Tue, 18 Aug 2015 09:15:52 GMT
Repository: cloudstack
Updated Branches:
  refs/heads/4.5 606afe341 -> b655104b7


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/b655104b
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/b655104b
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/b655104b

Branch: refs/heads/4.5
Commit: b655104b77286889cc849a5bad4fcceb38234606
Parents: 606afe3
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:06:19 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/b655104b/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 73aa94c..2b94aaf 100755
--- a/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
+++ b/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
@@ -4480,7 +4480,7 @@ VirtualMachineGuru, Listener, Configurable, StateListener<State,
VirtualMachine.
                 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