Commit 5c9c0e0e authored by Michael Hanselmann's avatar Michael Hanselmann

Move ganeti-confd to ganeti.server.confd

Signed-off-by: default avatarMichael Hanselmann <hansmi@google.com>
Reviewed-by: default avatarRené Nussbaumer <rn@google.com>
parent 29d91329
......@@ -36,6 +36,7 @@
/daemons/daemon-util
/daemons/ensure-dirs
/daemons/ganeti-cleaner
/daemons/ganeti-confd
/daemons/ganeti-masterd
/daemons/ganeti-watcher
......
......@@ -197,6 +197,7 @@ watcher_PYTHON = \
server_PYTHON = \
lib/server/__init__.py \
lib/server/confd.py \
lib/server/masterd.py
docrst = \
......@@ -281,6 +282,7 @@ gnt_scripts = \
scripts/gnt-os
PYTHON_BOOTSTRAP = \
daemons/ganeti-confd \
daemons/ganeti-masterd \
daemons/ganeti-watcher \
scripts/gnt-backup \
......@@ -293,7 +295,6 @@ PYTHON_BOOTSTRAP = \
dist_sbin_SCRIPTS = \
daemons/ganeti-noded \
daemons/ganeti-confd \
daemons/ganeti-rapi
nodist_sbin_SCRIPTS = \
......
......@@ -293,7 +293,7 @@ def ExecConfd(options, args, prep_data): # pylint: disable-msg=W0613
mainloop.Run()
def main():
def Main():
"""Main function for the confd daemon.
"""
......@@ -303,7 +303,3 @@ def main():
constants.RELEASE_VERSION)
daemon.GenericMain(constants.CONFD, parser, CheckConfd, PrepConfd, ExecConfd)
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