diff options
-rw-r--r-- | docs/func.pod | 10 | ||||
-rwxr-xr-x | func/overlord/client.py | 1 | ||||
-rw-r--r-- | func/overlord/func_command.py | 2 | ||||
-rw-r--r-- | version | 2 |
4 files changed, 9 insertions, 6 deletions
diff --git a/docs/func.pod b/docs/func.pod index b73bcf9..a98dabe 100644 --- a/docs/func.pod +++ b/docs/func.pod @@ -4,9 +4,13 @@ Func -- Fedora Unified Network Controller. =head1 SYNOPSIS -func target.example.org module command [args ...] [--verbose] -func "target*.example.org" module command [args ...] [--verbose] -func "webserver1;mailserver2" module command [args ...] [--verbose] +func target.example.org call module command [args ...] [--verbose] + +func "target*.example.org" call module command [args ...] [--verbose] + +func "webserver1;mailserver2" call module command [args ...] [--verbose] + +func "*" --list-minions =head1 DESCRIPTION diff --git a/func/overlord/client.py b/func/overlord/client.py index 641ad76..1ff35d2 100755 --- a/func/overlord/client.py +++ b/func/overlord/client.py @@ -187,7 +187,6 @@ class Client(object): retval = getattr(conn, meth)(*args[:]) if self.interactive: print retval -# pprint.pprint(retval) except Exception, e: retval = e if self.interactive: diff --git a/func/overlord/func_command.py b/func/overlord/func_command.py index 87c3e09..507a52f 100644 --- a/func/overlord/func_command.py +++ b/func/overlord/func_command.py @@ -14,7 +14,7 @@ from cmd_modules import copyfile from func.overlord import client class FuncCommandLine(command.Command): - name = "client" + name = "func" useage = "func is the commandline interface to a func minion" subCommandClasses = [call.Call, show.Show, @@ -1 +1 @@ -0.12 1 +0.13 1 |