Commit 6d50f5f9 authored by Michael Hanselmann's avatar Michael Hanselmann
Browse files

Move gnt-os to ganeti.client.gnt_os


Signed-off-by: default avatarMichael Hanselmann <hansmi@google.com>
Reviewed-by: default avatarIustin Pop <iustin@google.com>
parent c2855a12
...@@ -68,3 +68,4 @@ ...@@ -68,3 +68,4 @@
# scripts # scripts
/scripts/gnt-debug /scripts/gnt-debug
/scripts/gnt-os
...@@ -139,7 +139,8 @@ pkgpython_PYTHON = \ ...@@ -139,7 +139,8 @@ pkgpython_PYTHON = \
client_PYTHON = \ client_PYTHON = \
lib/client/__init__.py \ lib/client/__init__.py \
lib/client/gnt_debug.py lib/client/gnt_debug.py \
lib/client/gnt_os.py
hypervisor_PYTHON = \ hypervisor_PYTHON = \
lib/hypervisor/__init__.py \ lib/hypervisor/__init__.py \
...@@ -256,7 +257,8 @@ gnt_scripts = \ ...@@ -256,7 +257,8 @@ gnt_scripts = \
scripts/gnt-os scripts/gnt-os
PYTHON_BOOTSTRAP = \ PYTHON_BOOTSTRAP = \
scripts/gnt-debug scripts/gnt-debug \
scripts/gnt-os
dist_sbin_SCRIPTS = \ dist_sbin_SCRIPTS = \
daemons/ganeti-noded \ daemons/ganeti-noded \
...@@ -268,8 +270,7 @@ dist_sbin_SCRIPTS = \ ...@@ -268,8 +270,7 @@ dist_sbin_SCRIPTS = \
scripts/gnt-cluster \ scripts/gnt-cluster \
scripts/gnt-instance \ scripts/gnt-instance \
scripts/gnt-job \ scripts/gnt-job \
scripts/gnt-node \ scripts/gnt-node
scripts/gnt-os
nodist_sbin_SCRIPTS = \ nodist_sbin_SCRIPTS = \
$(PYTHON_BOOTSTRAP) \ $(PYTHON_BOOTSTRAP) \
......
#!/usr/bin/python #
# #
# Copyright (C) 2006, 2007, 2010 Google Inc. # Copyright (C) 2006, 2007, 2010 Google Inc.
...@@ -26,8 +26,6 @@ ...@@ -26,8 +26,6 @@
# W0614: Unused import %s from wildcard import (since we need cli) # W0614: Unused import %s from wildcard import (since we need cli)
# C0103: Invalid name gnt-os # C0103: Invalid name gnt-os
import sys
from ganeti.cli import * from ganeti.cli import *
from ganeti import constants from ganeti import constants
from ganeti import opcodes from ganeti import opcodes
...@@ -298,5 +296,6 @@ commands = { ...@@ -298,5 +296,6 @@ commands = {
"", "Modify the OS parameters"), "", "Modify the OS parameters"),
} }
if __name__ == '__main__':
sys.exit(GenericMain(commands)) def Main():
return GenericMain(commands)
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