From 230c9cf59e6e3d462a47a3329077ed728ddf5ddf Mon Sep 17 00:00:00 2001
From: Michael Andersen <mandersen@schubergphilis.com>
Date: Tue, 22 Dec 2015 20:38:18 +0100
Subject: [PATCH] FIX S2S VPN rVPC: Check only redundant routers in state
 MASTER

---
 .../network/router/VirtualNetworkApplianceManagerImpl.java     | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java b/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
index 41cc5586115..ac8b86816a2 100644
--- a/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
+++ b/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
@@ -907,6 +907,9 @@ Configurable, StateListener<VirtualMachine.State, VirtualMachine.Event, VirtualM
             if (conns == null || conns.isEmpty()) {
                 continue;
             }
+            if (router.getIsRedundantRouter() && router.getRedundantState() != RedundantState.MASTER){
+                continue;
+            }
             if (router.getState() != VirtualMachine.State.Running) {
                 for (final Site2SiteVpnConnectionVO conn : conns) {
                     if (conn.getState() != Site2SiteVpnConnection.State.Error) {