Merge pull request #23680 from cachedout/issue_23403

Rename kwarg in cloud runner
This commit is contained in:
Justin Findlay 2015-05-13 13:44:02 -06:00
commit 1b86460d73
2 changed files with 15 additions and 2 deletions

View file

@ -0,0 +1,13 @@
===========================
Salt 2014.7.6 Release Notes
===========================
:release: TBA
Version 2014.7.6 is a bugfix release for :doc:`2014.7.0
</topics/releases/2014.7.0>`.
Changes:
- salt.runners.cloud.action() has changed the `fun` keyword argument to `func`.
Please update any calls to this function in the cloud runner.

View file

@ -107,7 +107,7 @@ def destroy(instances):
def action(
fun=None,
func=None,
cloudmap=None,
instances=None,
provider=None,
@ -117,7 +117,7 @@ def action(
Execute a single action on the given map/provider/instance
'''
client = _get_client()
info = client.action(fun, cloudmap, instances, provider, instance, kwargs)
info = client.action(func, cloudmap, instances, provider, instance, kwargs)
return info