Commit 5119f2ec authored by Michael Hanselmann's avatar Michael Hanselmann

Move ganeti-noded to ganeti.server.noded

Signed-off-by: default avatarMichael Hanselmann <hansmi@google.com>
Reviewed-by: default avatarRené Nussbaumer <rn@google.com>
parent 5c9c0e0e
...@@ -38,6 +38,7 @@ ...@@ -38,6 +38,7 @@
/daemons/ganeti-cleaner /daemons/ganeti-cleaner
/daemons/ganeti-confd /daemons/ganeti-confd
/daemons/ganeti-masterd /daemons/ganeti-masterd
/daemons/ganeti-noded
/daemons/ganeti-watcher /daemons/ganeti-watcher
# devel # devel
......
...@@ -198,7 +198,8 @@ watcher_PYTHON = \ ...@@ -198,7 +198,8 @@ watcher_PYTHON = \
server_PYTHON = \ server_PYTHON = \
lib/server/__init__.py \ lib/server/__init__.py \
lib/server/confd.py \ lib/server/confd.py \
lib/server/masterd.py lib/server/masterd.py \
lib/server/noded.py
docrst = \ docrst = \
doc/admin.rst \ doc/admin.rst \
...@@ -284,6 +285,7 @@ gnt_scripts = \ ...@@ -284,6 +285,7 @@ gnt_scripts = \
PYTHON_BOOTSTRAP = \ PYTHON_BOOTSTRAP = \
daemons/ganeti-confd \ daemons/ganeti-confd \
daemons/ganeti-masterd \ daemons/ganeti-masterd \
daemons/ganeti-noded \
daemons/ganeti-watcher \ daemons/ganeti-watcher \
scripts/gnt-backup \ scripts/gnt-backup \
scripts/gnt-cluster \ scripts/gnt-cluster \
...@@ -294,7 +296,6 @@ PYTHON_BOOTSTRAP = \ ...@@ -294,7 +296,6 @@ PYTHON_BOOTSTRAP = \
scripts/gnt-os scripts/gnt-os
dist_sbin_SCRIPTS = \ dist_sbin_SCRIPTS = \
daemons/ganeti-noded \
daemons/ganeti-rapi daemons/ganeti-rapi
nodist_sbin_SCRIPTS = \ nodist_sbin_SCRIPTS = \
......
...@@ -973,6 +973,7 @@ def PrepNoded(options, _): ...@@ -973,6 +973,7 @@ def PrepNoded(options, _):
server.Start() server.Start()
return (mainloop, server) return (mainloop, server)
def ExecNoded(options, args, prep_data): # pylint: disable-msg=W0613 def ExecNoded(options, args, prep_data): # pylint: disable-msg=W0613
"""Main node daemon function, executed with the PID file held. """Main node daemon function, executed with the PID file held.
...@@ -984,7 +985,7 @@ def ExecNoded(options, args, prep_data): # pylint: disable-msg=W0613 ...@@ -984,7 +985,7 @@ def ExecNoded(options, args, prep_data): # pylint: disable-msg=W0613
server.Stop() server.Stop()
def main(): def Main():
"""Main function for the node daemon. """Main function for the node daemon.
""" """
...@@ -1000,7 +1001,3 @@ def main(): ...@@ -1000,7 +1001,3 @@ def main():
default_ssl_cert=constants.NODED_CERT_FILE, default_ssl_cert=constants.NODED_CERT_FILE,
default_ssl_key=constants.NODED_CERT_FILE, default_ssl_key=constants.NODED_CERT_FILE,
console_logging=True) console_logging=True)
if __name__ == '__main__':
main()
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment