From 1216f4a0463e10eaef9cd22f03186353c0be655d Mon Sep 17 00:00:00 2001
From: Joshua Boniface <joshua@boniface.me>
Date: Sun, 30 Sep 2018 19:06:18 -0400
Subject: [PATCH] Ordering bug

---
 router-daemon/pvcrd/VXNetworkInstance.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/router-daemon/pvcrd/VXNetworkInstance.py b/router-daemon/pvcrd/VXNetworkInstance.py
index 18a453dd..f8794fee 100644
--- a/router-daemon/pvcrd/VXNetworkInstance.py
+++ b/router-daemon/pvcrd/VXNetworkInstance.py
@@ -79,10 +79,10 @@ class VXNetworkInstance():
         @zk_conn.DataWatch('/networks/{}/ip_gateway'.format(self.vni))
         def watch_network_gateway(data, stat, event=''):
             if data and self.ip_gateway != data.decode('ascii'):
+                self.ip_gateway = data.decode('ascii')
                 if self.this_router.network_state == 'primary':
                     if self.ip_gateway:
                         self.removeGatewayAddress()
-                    self.ip_gateway = data.decode('ascii')
                     self.createGatewayAddress()
 
         @zk_conn.DataWatch('/networks/{}/dhcp_flag'.format(self.vni))