Commit d9c82a4e authored by Michael Hanselmann's avatar Michael Hanselmann

Move ganeti-rapi to ganeti.server.rapi

Signed-off-by: default avatarMichael Hanselmann <hansmi@google.com>
Reviewed-by: default avatarRené Nussbaumer <rn@google.com>
parent 5119f2ec
......@@ -39,6 +39,7 @@
/daemons/ganeti-confd
/daemons/ganeti-masterd
/daemons/ganeti-noded
/daemons/ganeti-rapi
/daemons/ganeti-watcher
# devel
......
......@@ -199,7 +199,8 @@ server_PYTHON = \
lib/server/__init__.py \
lib/server/confd.py \
lib/server/masterd.py \
lib/server/noded.py
lib/server/noded.py \
lib/server/rapi.py
docrst = \
doc/admin.rst \
......@@ -287,6 +288,7 @@ PYTHON_BOOTSTRAP = \
daemons/ganeti-masterd \
daemons/ganeti-noded \
daemons/ganeti-watcher \
daemons/ganeti-rapi \
scripts/gnt-backup \
scripts/gnt-cluster \
scripts/gnt-debug \
......@@ -295,8 +297,7 @@ PYTHON_BOOTSTRAP = \
scripts/gnt-node \
scripts/gnt-os
dist_sbin_SCRIPTS = \
daemons/ganeti-rapi
dist_sbin_SCRIPTS =
nodist_sbin_SCRIPTS = \
$(PYTHON_BOOTSTRAP) \
......
......@@ -339,7 +339,7 @@ def ExecRapi(options, args, prep_data): # pylint: disable-msg=W0613
server.Stop()
def main():
def Main():
"""Main function.
"""
......@@ -350,7 +350,3 @@ def main():
daemon.GenericMain(constants.RAPI, parser, CheckRapi, PrepRapi, ExecRapi,
default_ssl_cert=constants.RAPI_CERT_FILE,
default_ssl_key=constants.RAPI_CERT_FILE)
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