Run plugins support for more plugins arguments

datacratic · Aug 5, 2014 · c3e097d · c3e097d
1 parent b847b68
commit c3e097d
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 7 deletions.
diff --git a/starcluster/cluster.py b/starcluster/cluster.py
@@ -380,7 +380,7 @@ def list_clusters(self, cluster_groups=None, show_ssh_status=False):
                 print 'Cluster nodes: N/A'
             print
 
-    def run_plugin(self, plugin_name, cluster_tag):
+    def run_plugin(self, plugin_name, cluster_tag, args=[]):
         """
         Run a plugin defined in the config.
 
@@ -392,7 +392,7 @@ def run_plugin(self, plugin_name, cluster_tag):
             raise exception.ClusterNotRunning(cluster_tag)
         plugs = [self.cfg.get_plugin(plugin_name)]
         plug = deathrow._load_plugins(plugs)[0]
-        cl.run_plugin(plug, name=plugin_name)
+        cl.run_plugin(plug, name=plugin_name, args=args)
 
 
 class Cluster(object):
@@ -1909,7 +1909,8 @@ def run_plugins(self, plugins=None, method_name="run", node=None,
         for plug in plugs:
             self.run_plugin(plug, method_name=method_name, node=node)
 
-    def run_plugin(self, plugin, name='', method_name='run', node=None):
+    def run_plugin(self, plugin, name='', method_name='run', node=None,
+                   args=[]):
         """
         Run a StarCluster plugin.
 
@@ -1928,7 +1929,7 @@ def run_plugin(self, plugin, name='', method_name='run', node=None):
                          (plugin_name, method_name))
                 return
             args = [self.nodes, self.master_node, self.cluster_user,
-                    self.cluster_shell, self.volumes]
+                    self.cluster_shell, self.volumes] + args
             if node:
                 args.insert(0, node)
             log.info("Running plugin %s" % plugin_name)

diff --git a/starcluster/commands/runplugin.py b/starcluster/commands/runplugin.py
@@ -34,7 +34,8 @@ class CmdRunPlugin(CmdBase):
     names = ['runplugin', 'rp']
 
     def execute(self, args):
-        if len(args) != 2:
+        if len(args) < 2:
             self.parser.error("Please provide a plugin_name and <cluster_tag>")
-        plugin_name, cluster_tag = args
-        self.cm.run_plugin(plugin_name, cluster_tag)
+        plugin_name, cluster_tag = args[0:2]
+        args = args[2:]
+        self.cm.run_plugin(plugin_name, cluster_tag, args)