Commit 29d91329 authored by Michael Hanselmann's avatar Michael Hanselmann

Move ganeti-masterd to ganeti.server.masterd

Signed-off-by: default avatarMichael Hanselmann <hansmi@google.com>
Reviewed-by: default avatarRené Nussbaumer <rn@google.com>
parent 899c4d2c
......@@ -36,6 +36,7 @@
/daemons/daemon-util
/daemons/ensure-dirs
/daemons/ganeti-cleaner
/daemons/ganeti-masterd
/daemons/ganeti-watcher
# devel
......
......@@ -196,7 +196,8 @@ watcher_PYTHON = \
lib/watcher/__init__.py
server_PYTHON = \
lib/server/__init__.py
lib/server/__init__.py \
lib/server/masterd.py
docrst = \
doc/admin.rst \
......@@ -280,6 +281,7 @@ gnt_scripts = \
scripts/gnt-os
PYTHON_BOOTSTRAP = \
daemons/ganeti-masterd \
daemons/ganeti-watcher \
scripts/gnt-backup \
scripts/gnt-cluster \
......@@ -291,7 +293,6 @@ PYTHON_BOOTSTRAP = \
dist_sbin_SCRIPTS = \
daemons/ganeti-noded \
daemons/ganeti-masterd \
daemons/ganeti-confd \
daemons/ganeti-rapi
......
......@@ -590,7 +590,7 @@ def ExecMasterd(options, args, prep_data): # pylint: disable-msg=W0613
utils.RemoveFile(constants.MASTER_SOCKET)
def main():
def Main():
"""Main function"""
parser = OptionParser(description="Ganeti master daemon",
usage="%prog [-f] [-d]",
......@@ -605,7 +605,3 @@ def main():
default=False, action="store_true")
daemon.GenericMain(constants.MASTERD, parser, CheckMasterd, PrepMasterd,
ExecMasterd, multithreaded=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