summaryrefslogtreecommitdiffstats
path: root/func/overlord
diff options
context:
space:
mode:
authorSteve 'Ashcrow' Milner <stevem@gnulinux.net>2008-01-13 14:35:45 -0500
committerSteve 'Ashcrow' Milner <stevem@gnulinux.net>2008-01-13 14:35:45 -0500
commitb77fbdd90f46b3d1602aa43e99abec096d93888e (patch)
tree9d8ac00601e056ac79f5679b88cc19bb65293190 /func/overlord
parent63170952d465a8acf8355e7b346733e4f6ddcace (diff)
downloadthird_party-func-b77fbdd90f46b3d1602aa43e99abec096d93888e.tar.gz
third_party-func-b77fbdd90f46b3d1602aa43e99abec096d93888e.tar.xz
third_party-func-b77fbdd90f46b3d1602aa43e99abec096d93888e.zip
removed a lot of misplaced shebangs.
Diffstat (limited to 'func/overlord')
-rw-r--r--func/overlord/cmd_modules/ping.py8
-rw-r--r--func/overlord/cmd_modules/show.py5
-rw-r--r--func/overlord/func_command.py2
-rwxr-xr-xfunc/overlord/inventory.py6
-rwxr-xr-x[-rw-r--r--]func/overlord/sslclient.py0
-rwxr-xr-x[-rw-r--r--]func/overlord/test_func.py0
6 files changed, 4 insertions, 17 deletions
diff --git a/func/overlord/cmd_modules/ping.py b/func/overlord/cmd_modules/ping.py
index 29fa9d0..397adc8 100644
--- a/func/overlord/cmd_modules/ping.py
+++ b/func/overlord/cmd_modules/ping.py
@@ -1,5 +1,3 @@
-#!/usr/bin/python
-
"""
copyfile command line
@@ -15,7 +13,6 @@ along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
"""
-
import optparse
import os
import pprint
@@ -28,11 +25,11 @@ from func.overlord import client
# FIXME: this really should not be in each sub module.
DEFAULT_PORT = 51234
+
class Ping(client.command.Command):
name = "ping"
useage = "see what func minions are up/accessible"
-
def addOptions(self):
"""
Not too many options for you! (Seriously, it's a simple command ... func "*" ping)
@@ -43,14 +40,12 @@ class Ping(client.command.Command):
self.parser.add_option("-p", "--port", dest="port",
default=DEFAULT_PORT)
-
def handleOptions(self, options):
"""
Nothing to do here...
"""
pass
-
def do(self, args):
self.server_spec = self.parentCommand.server_spec
@@ -72,4 +67,3 @@ class Ping(client.command.Command):
print "[ FAILED ] %s" % server
return 1
-
diff --git a/func/overlord/cmd_modules/show.py b/func/overlord/cmd_modules/show.py
index 9582e0d..4a26a75 100644
--- a/func/overlord/cmd_modules/show.py
+++ b/func/overlord/cmd_modules/show.py
@@ -1,5 +1,3 @@
-#!/usr/bin/python
-
"""
show introspection commandline
@@ -73,6 +71,7 @@ class ShowHardware(client.command.Command):
if arg in minion_data:
print minion_data[arg]
+
class Show(client.command.Command):
name = "show"
useage = "various simple report stuff"
@@ -98,5 +97,3 @@ class Show(client.command.Command):
def do(self, args):
pass
-
-
diff --git a/func/overlord/func_command.py b/func/overlord/func_command.py
index 7b491f7..76b4e95 100644
--- a/func/overlord/func_command.py
+++ b/func/overlord/func_command.py
@@ -1,5 +1,3 @@
-#!/usr/bin/python
-
import glob
import sys
diff --git a/func/overlord/inventory.py b/func/overlord/inventory.py
index f36ff69..aafc764 100755
--- a/func/overlord/inventory.py
+++ b/func/overlord/inventory.py
@@ -1,5 +1,4 @@
#!/usr/bin/python
-
##
## func inventory app.
## use func to collect inventory data on anything, yes, anything
@@ -30,6 +29,7 @@ import func.overlord.client as func_client
DEFAULT_TREE = "/var/lib/func/inventory/"
+
class FuncInventory(object):
def __init__(self):
@@ -81,8 +81,6 @@ class FuncInventory(object):
# see what modules each host provides (as well as what hosts we have)
host_methods = func_client.Client(options.server_spec).system.list_methods()
-
-
# call all remote info methods and handle them
if options.verbose:
# print "- DEBUG: %s" % host_methods
@@ -186,8 +184,8 @@ class FuncInventory(object):
# FIXME: check rc's
os.chdir(cwd)
+
if __name__ == "__main__":
inv = FuncInventory()
inv.run(sys.argv)
-
diff --git a/func/overlord/sslclient.py b/func/overlord/sslclient.py
index ccb2c9c..ccb2c9c 100644..100755
--- a/func/overlord/sslclient.py
+++ b/func/overlord/sslclient.py
diff --git a/func/overlord/test_func.py b/func/overlord/test_func.py
index 2b3f041..2b3f041 100644..100755
--- a/func/overlord/test_func.py
+++ b/func/overlord/test_func.py