Merge lp:~xfactor973/charm-helpers/action-params into lp:charm-helpers

[Chris Holcombe]

This patch adds dictionary of parameters to be passed to a juju run action. I made it a named argument with a default of None so that I don't break anyone currently tied to using this function.

[Ryan Beisner (1chb1n)]

review: Approve

[Charles Butler (lazypower)]

+1 LGTM

review: Approve

=== modified file 'charmhelpers/contrib/amulet/utils.py'
--- charmhelpers/contrib/amulet/utils.py	2015-09-21 14:25:14 +0000
+++ charmhelpers/contrib/amulet/utils.py	2016-03-18 19:11:35 +0000
@@ -782,15 +782,20 @@
 
 # amulet juju action helpers:
     def run_action(self, unit_sentry, action,
-                   _check_output=subprocess.check_output):
+                   _check_output=subprocess.check_output,
+                   params=None):
         """Run the named action on a given unit sentry.
 
+        params a dict of parameters to use
         _check_output parameter is used for dependency injection.
 
         @return action_id.
         """
         unit_id = unit_sentry.info["unit_name"]
         command = ["juju", "action", "do", "--format=json", unit_id, action]
+        if params is not None:
+            for key, value in params.iteritems():
+                command.append("{}={}".format(key, value))
         self.log.info("Running command: %s\n" % " ".join(command))
         output = _check_output(command, universal_newlines=True)
         data = json.loads(output)