From de708ef620b813f979ac9e6fbddd95c387e63d50 Mon Sep 17 00:00:00 2001
From: Joshua Boniface <joshua@boniface.me>
Date: Sun, 30 Sep 2018 13:45:20 -0400
Subject: [PATCH] Revert "Finagle how startup happens"

This reverts commit 3e937362cd457669b5585c4ab4c35a3d82ba843b.
---
 router-daemon/pvcrd/RouterInstance.py | 19 ++++++++-----------
 1 file changed, 8 insertions(+), 11 deletions(-)

diff --git a/router-daemon/pvcrd/RouterInstance.py b/router-daemon/pvcrd/RouterInstance.py
index ceb265fd..f1eedc74 100644
--- a/router-daemon/pvcrd/RouterInstance.py
+++ b/router-daemon/pvcrd/RouterInstance.py
@@ -49,7 +49,6 @@ class RouterInstance():
         self.s_network = s_network
         self.network_list = []
         self.ipmi_hostname = self.config['ipmi_hostname']
-        self.active = False
 
         # Zookeeper handlers for changed states
         @zk_conn.DataWatch('/routers/{}/daemonstate'.format(self.name))
@@ -66,6 +65,14 @@ class RouterInstance():
             except AttributeError:
                 self.network_state = 'secondary'
 
+            # toggle state management of this router
+            if s_network != {}: # If there's no network list, we're too early in startup
+                if self.name == self.this_router:
+                    if self.network_state == 'secondary':
+                        self.become_secondary()
+                    if self.network_state == 'primary':
+                        self.become_primary()
+
     # Get value functions
     def getname(self):
         return self.name
@@ -89,7 +96,6 @@ class RouterInstance():
             self.network_list.append(s_network[network].getvni())
 
     def become_secondary(self):
-        self.active = True
         ansiiprint.echo('Setting router {} to secondary state'.format(self.name), '', 'i')
         ansiiprint.echo('Network list: {}'.format(', '.join(self.network_list)), '', 'c')
         for router in self.t_router:
@@ -109,7 +115,6 @@ class RouterInstance():
             time.sleep(1)
 
     def become_primary(self):
-        self.active = True
         ansiiprint.echo('Setting router {} to primary state.'.format(self.name), '', 'i')
         ansiiprint.echo('Network list: {}'.format(', '.join(self.network_list)), '', 'c')
         for network in self.s_network:
@@ -207,14 +212,6 @@ class RouterInstance():
                 except ValueError:
                     pass
        
-        # toggle state management of this router
-        if s_network != {} and not self.active: # If there's no network list, we're too early in startup
-            if self.name == self.this_router:
-                if self.network_state == 'secondary':
-                    self.become_secondary()
-                if self.network_state == 'primary':
-                    self.become_primary()
-
        # Try to set ourself primary if there is no primary in the cluster
         cluster_has_primary = False
         for router in self.t_router: