Allow func-transmit to call "list_minions"

1 files changed, 25 insertions, 12 deletions

diff --git a/scripts/func-transmit b/scripts/func-transmit
index 067fec4..1a0e670 100644
--- a/scripts/func-transmit
+++ b/scripts/func-transmit
@@ -42,21 +42,34 @@ input = sys.stdin.read()
 params = yaml.load(input).next()
 
 # scan arguments
+
 clients    = params.get('clients', "*")
-async      = params.get('async', False)
-nforks     = params.get('nforks', 1)
-module     = params.get('module','unknown')
 method     = params.get('method','unknown')
-parameters = params.get('parameters', None)
-
-# make the call
-client = fc.Overlord(clients, async=async, nforks=nforks)
-module_handle = getattr(client, module)
-method_handle = getattr(module_handle, method)
-if parameters is not None:
-    results = method_handle(parameters)
+
+if method == "list_minions":
+    server_spec = "*"
+    minion_set = fc.Minions(server_spec)
+    servers = minion_set.get_all_hosts()
+    servers.sort()
+    results = servers
+ 
 else:
-    results = method_handle()
+    # scan more arguments
+    async      = params.get('async', False)
+    nforks     = params.get('nforks', 1)
+    module     = params.get('module','unknown')
+    parameters = params.get('parameters', None)
+
+    # make the call
+    client = fc.Overlord(clients, async=async, nforks=nforks)
+    module_handle = getattr(client, module)
+    method_handle = getattr(module_handle, method)
+    if parameters is not None:
+        results = method_handle(parameters)
+    else:
+        results = method_handle()
+
+# convert to YAML
 output = yaml.dump(results)
 
 # write to stdout