Abstract starting the node daemons

We're using a separate function for this, as we're going to add some
functionality to this feature.

Signed-off-by: Guido Trotter <ultrotter@google.com>
Reviewed-by: Iustin Pop <iustin@google.com>

diff --git a/daemons/ganeti-watcher b/daemons/ganeti-watcher
index 9a2a2a8..351f4d8 100755 (executable)
--- a/daemons/ganeti-watcher
+++ b/daemons/ganeti-watcher
@@ -84,6 +84,16 @@ def EnsureDaemon(name):
   return True
 
 
+def StartNodeDaemons():
+  """Start all the daemons that should be running on all nodes.
+
+  """
+  # on master or not, try to start the node dameon
+  EnsureDaemon(constants.NODED)
+  # start confd as well. On non candidates it will be in disabled mode.
+  EnsureDaemon(constants.CONFD)
+
+
 class WatcherState(object):
   """Interface to a state file recording restart attempts.
 
@@ -477,10 +487,7 @@ def main():
 
   update_file = False
   try:
-    # on master or not, try to start the node dameon
-    EnsureDaemon(constants.NODED)
-    # start confd as well. On non candidates it will be in disabled mode.
-    EnsureDaemon(constants.CONFD)
+    StartNodeDaemons()
 
     notepad = WatcherState()
     try: