diff options
author | Michael DeHaan <mdehaan@redhat.com> | 2008-01-15 15:31:03 -0500 |
---|---|---|
committer | Michael DeHaan <mdehaan@redhat.com> | 2008-01-15 15:31:03 -0500 |
commit | dc85cea9b1912ad2cbe59224050b8ae38b051167 (patch) | |
tree | 6aa8b6efdcbc3335521edd0a89a41364cac54608 /func/overlord | |
parent | b51e8c0837354eba4e234a1f9bcf0ecd630d2ae0 (diff) | |
parent | 7ec2b2c68be0545e2dc0e7eb4ae93ef4270b47a9 (diff) | |
download | func-dc85cea9b1912ad2cbe59224050b8ae38b051167.tar.gz func-dc85cea9b1912ad2cbe59224050b8ae38b051167.tar.xz func-dc85cea9b1912ad2cbe59224050b8ae38b051167.zip |
Merge branch 'master' of ssh://git.fedoraproject.org/git/hosted/func
Diffstat (limited to 'func/overlord')
-rw-r--r-- | func/overlord/cmd_modules/call.py | 2 | ||||
-rw-r--r-- | func/overlord/cmd_modules/copyfile.py | 2 | ||||
-rw-r--r-- | func/overlord/cmd_modules/listminions.py | 2 | ||||
-rw-r--r-- | func/overlord/cmd_modules/ping.py | 2 | ||||
-rw-r--r-- | func/overlord/cmd_modules/show.py | 4 | ||||
-rw-r--r-- | func/overlord/func_command.py | 2 | ||||
-rwxr-xr-x | func/overlord/inventory.py | 2 | ||||
-rwxr-xr-x | func/overlord/sslclient.py | 2 |
8 files changed, 7 insertions, 11 deletions
diff --git a/func/overlord/cmd_modules/call.py b/func/overlord/cmd_modules/call.py index 4828981..7add5bf 100644 --- a/func/overlord/cmd_modules/call.py +++ b/func/overlord/cmd_modules/call.py @@ -25,7 +25,7 @@ DEFAULT_FORKS = 1 class Call(client.command.Command): name = "call" - useage = "call nodule method name arg1 arg2..." + usage = "call module method name arg1 arg2..." def addOptions(self): self.parser.add_option("-v", "--verbose", dest="verbose", action="store_true") diff --git a/func/overlord/cmd_modules/copyfile.py b/func/overlord/cmd_modules/copyfile.py index 7950b7b..295aeab 100644 --- a/func/overlord/cmd_modules/copyfile.py +++ b/func/overlord/cmd_modules/copyfile.py @@ -26,7 +26,7 @@ DEFAULT_PORT = 51234 class CopyFile(client.command.Command): name = "copyfile" - useage = "copy a file to a client" + usage = "copy a file to a client" def addOptions(self): diff --git a/func/overlord/cmd_modules/listminions.py b/func/overlord/cmd_modules/listminions.py index b34efe4..50c7e24 100644 --- a/func/overlord/cmd_modules/listminions.py +++ b/func/overlord/cmd_modules/listminions.py @@ -22,7 +22,7 @@ DEFAULT_PORT = 51234 class ListMinions(client.command.Command): name = "list_minions" - useage = "show known minions" + usage = "show known minions" def addOptions(self): self.parser.add_option("-v", "--verbose", dest="verbose", diff --git a/func/overlord/cmd_modules/ping.py b/func/overlord/cmd_modules/ping.py index 397adc8..f756fd9 100644 --- a/func/overlord/cmd_modules/ping.py +++ b/func/overlord/cmd_modules/ping.py @@ -28,7 +28,7 @@ DEFAULT_PORT = 51234 class Ping(client.command.Command): name = "ping" - useage = "see what func minions are up/accessible" + usage = "see what func minions are up/accessible" def addOptions(self): """ diff --git a/func/overlord/cmd_modules/show.py b/func/overlord/cmd_modules/show.py index 4a26a75..e1df554 100644 --- a/func/overlord/cmd_modules/show.py +++ b/func/overlord/cmd_modules/show.py @@ -25,7 +25,7 @@ DEFAULT_PORT = 51234 class ShowHardware(client.command.Command): name = "hardware" - useage = "show hardware details" + usage = "show hardware details" # FIXME: we might as well make verbose be in the subclass # and probably an inc variable while we are at it @@ -74,7 +74,7 @@ class ShowHardware(client.command.Command): class Show(client.command.Command): name = "show" - useage = "various simple report stuff" + usage = "various simple report stuff" subCommandClasses = [ShowHardware] def addOptions(self): self.parser.add_option("-v", "--verbose", dest="verbose", diff --git a/func/overlord/func_command.py b/func/overlord/func_command.py index 76b4e95..09b324a 100644 --- a/func/overlord/func_command.py +++ b/func/overlord/func_command.py @@ -15,7 +15,7 @@ from func.overlord import client class FuncCommandLine(command.Command): name = "func" - useage = "func is the commandline interface to a func minion" + usage = "func is the commandline interface to a func minion" subCommandClasses = [call.Call, show.Show, copyfile.CopyFile, listminions.ListMinions, ping.Ping] diff --git a/func/overlord/inventory.py b/func/overlord/inventory.py index aafc764..e5319ee 100755 --- a/func/overlord/inventory.py +++ b/func/overlord/inventory.py @@ -1,4 +1,3 @@ -#!/usr/bin/python ## ## func inventory app. ## use func to collect inventory data on anything, yes, anything @@ -186,6 +185,5 @@ class FuncInventory(object): if __name__ == "__main__": - inv = FuncInventory() inv.run(sys.argv) diff --git a/func/overlord/sslclient.py b/func/overlord/sslclient.py index ccb2c9c..3861bb8 100755 --- a/func/overlord/sslclient.py +++ b/func/overlord/sslclient.py @@ -1,5 +1,3 @@ -#!/usr/bin/python - import sys import xmlrpclib import urllib |