Commit 8e55e20f authored by Michael Hanselmann's avatar Michael Hanselmann

Move burnin to ganeti.tools.burnin

Similar to other scripts, “tools/burnin” just becomes a wrapper script.
Signed-off-by: default avatarMichael Hanselmann <hansmi@google.com>
Reviewed-by: default avatarGuido Trotter <ultrotter@google.com>
parent 45566243
......@@ -97,6 +97,7 @@
# tools
/tools/kvm-ifup
/tools/burnin
/tools/ensure-dirs
/tools/vcluster-setup
/tools/node-cleanup
......
......@@ -340,6 +340,7 @@ server_PYTHON = \
pytools_PYTHON = \
lib/tools/__init__.py \
lib/tools/burnin.py \
lib/tools/ensure_dirs.py \
lib/tools/node_cleanup.py \
lib/tools/node_daemon_setup.py \
......@@ -701,6 +702,7 @@ PYTHON_BOOTSTRAP_SBIN = \
PYTHON_BOOTSTRAP = \
$(PYTHON_BOOTSTRAP_SBIN) \
tools/burnin \
tools/ensure-dirs \
tools/node-cleanup \
tools/node-daemon-setup \
......@@ -799,7 +801,6 @@ nodist_sbin_SCRIPTS += src/ganeti-confd
endif
python_scripts = \
tools/burnin \
tools/cfgshell \
tools/cfgupgrade \
tools/cfgupgrade12 \
......@@ -829,6 +830,7 @@ pkglib_python_scripts = \
tools/check-cert-expired
nodist_pkglib_python_scripts = \
tools/burnin \
tools/ensure-dirs \
tools/node-daemon-setup \
tools/prepare-node-join
......@@ -1496,6 +1498,7 @@ $(REPLACE_VARS_SED): $(SHELL_ENV_INIT) Makefile stamp-directories
daemons/ganeti-%: MODULE = ganeti.server.$(patsubst ganeti-%,%,$(notdir $@))
daemons/ganeti-watcher: MODULE = ganeti.watcher
scripts/%: MODULE = ganeti.client.$(subst -,_,$(notdir $@))
tools/burnin: MODULE = ganeti.tools.burnin
tools/ensure-dirs: MODULE = ganeti.tools.ensure_dirs
tools/node-daemon-setup: MODULE = ganeti.tools.node_daemon_setup
tools/prepare-node-join: MODULE = ganeti.tools.prepare_node_join
......
......@@ -39,6 +39,8 @@ from ganeti import utils
from ganeti import build
from ganeti import pathutils
from ganeti.tools import burnin
# _autoconf shouldn't be imported from anywhere except constants.py, but we're
# making an exception here because this script is only used at build time.
from ganeti import _autoconf
......@@ -838,7 +840,6 @@ def main():
build.LoadModule(filename)))
# Burnin script
burnin = build.LoadModule("tools/burnin")
WriteCompletion(sw, "%s/burnin" % pathutils.TOOLSDIR, "_ganeti_burnin",
debug,
opts=burnin.OPTIONS, args=burnin.ARGUMENTS)
......
......@@ -1153,7 +1153,7 @@ class Burner(object):
return constants.EXIT_SUCCESS
def main():
def Main():
"""Main function.
"""
......@@ -1161,7 +1161,3 @@ def main():
debug=False, stderr_logging=True)
return Burner().BurninCluster()
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