diff --git a/.gitignore b/.gitignore index af2930e0fa38a5e56ef5377d062210c1c0b47904..3c210fa7ecd3729fe6cba409e9617a98d981f370 100644 --- a/.gitignore +++ b/.gitignore @@ -38,6 +38,7 @@ /daemons/ganeti-cleaner /daemons/ganeti-confd /daemons/ganeti-masterd +/daemons/ganeti-noded /daemons/ganeti-watcher # devel diff --git a/Makefile.am b/Makefile.am index 24b8b3f3f27606215d055cb8e72631401d8fc3e2..3e87c3be122c2ef8dc24b0567241c3444743d068 100644 --- a/Makefile.am +++ b/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 = \ diff --git a/daemons/ganeti-noded b/lib/server/noded.py old mode 100755 new mode 100644 similarity index 99% rename from daemons/ganeti-noded rename to lib/server/noded.py index 4325c7b8d6c1c6d15c35e2b8e3a53d9d2ad47051..b3064527e9964af2107b4d3661c5d526b865bc22 --- a/daemons/ganeti-noded +++ b/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()