Move ganeti-noded to ganeti.server.noded

Signed-off-by: Michael Hanselmann <hansmi@google.com>
Reviewed-by: René Nussbaumer <rn@google.com>

.gitignore

@@ -38,6 +38,7 @@
 /daemons/ganeti-cleaner
 /daemons/ganeti-confd
 /daemons/ganeti-masterd
+/daemons/ganeti-noded
 /daemons/ganeti-watcher
 
 # devel

Makefile.am

@@ -198,7 +198,8 @@ watcher_PYTHON = \
 server_PYTHON = \
 	lib/server/__init__.py \
 	lib/server/confd.py \
-	lib/server/masterd.py
+	lib/server/masterd.py \
+	lib/server/noded.py
 
 docrst = \
 	doc/admin.rst \
@@ -284,6 +285,7 @@ gnt_scripts = \
 PYTHON_BOOTSTRAP = \
 	daemons/ganeti-confd \
 	daemons/ganeti-masterd \
+	daemons/ganeti-noded \
 	daemons/ganeti-watcher \
 	scripts/gnt-backup \
 	scripts/gnt-cluster \
@@ -294,7 +296,6 @@ PYTHON_BOOTSTRAP = \
 	scripts/gnt-os
 
 dist_sbin_SCRIPTS = \
-	daemons/ganeti-noded \
 	daemons/ganeti-rapi
 
 nodist_sbin_SCRIPTS = \

daemons/ganeti-noded → lib/server/noded.py

@@ -973,6 +973,7 @@ def PrepNoded(options, _):
   server.Start()
   return (mainloop, server)
 
+
 def ExecNoded(options, args, prep_data): # pylint: disable-msg=W0613
   """Main node daemon function, executed with the PID file held.
 
@@ -984,7 +985,7 @@ def ExecNoded(options, args, prep_data): # pylint: disable-msg=W0613
     server.Stop()
 
 
-def main():
+def Main():
   """Main function for the node daemon.
 
   """
@@ -1000,7 +1001,3 @@ def main():
                      default_ssl_cert=constants.NODED_CERT_FILE,
                      default_ssl_key=constants.NODED_CERT_FILE,
                      console_logging=True)
-
-
-if __name__ == '__main__':
-  main()