Merge pull request #296 from cloudify-incubator/1.25.12-build

Author: EarthmanT

CHANGELOG.txt

@@ -1,3 +1,4 @@
+1.25.12: Allow kwargs override in custom workflow.
 1.25.11: Do not log secrets by default.
 1.25.10: Add plugin_1_4.yaml
 1.25.9:

cloudify_custom_workflow/tasks.py

@@ -36,7 +36,10 @@ def log(**kwargs):
 
 
 @workflow
-def customwf(nodes_to_runon, operations_to_execute, **kwargs):
+def customwf(nodes_to_runon,
+             operations_to_execute,
+             allow_kwargs_override=False,
+             **kwargs):
 
     ctx = workflow_ctx
     ctx.logger.info("Starting Custom Workflow")
@@ -70,8 +73,10 @@ def customwf(nodes_to_runon, operations_to_execute, **kwargs):
                             instance.send_event(
                                 'Starting to {} on instance {} of node {}'
                                 .format(operation, instance.id, node.id)),
-                            instance.execute_operation(operation,
-                                                       kwargs=kwargs),
+                            instance.execute_operation(
+                                operation,
+                                allow_kwargs_override=allow_kwargs_override,
+                                kwargs=kwargs),
                             instance.send_event('Done {}'.format(operation)))
 
     graph.execute()

cloudify_custom_workflow/tests/test_workflows.py

@@ -74,8 +74,10 @@ def test_customwf(self):
             with patch('cloudify_custom_workflow.tasks.workflow_ctx', _ctx):
                 tasks.customwf(ctx=_ctx, nodes_to_runon=['node_id'],
                                operations_to_execute=['operation1'])
-        _instance.execute_operation.assert_called_with('operation1',
-                                                       kwargs={})
+        _instance.execute_operation.assert_called_with(
+            'operation1',
+            allow_kwargs_override=False,
+            kwargs={})
 
 
 if __name__ == '__main__':

plugin.yaml

@@ -3,7 +3,7 @@ plugins:
   cfy_util: &utilities_plugin
     executor: central_deployment_agent
     package_name: cloudify-utilities-plugin
-    package_version: '1.25.11'
+    package_version: '1.25.12'
 
   cfy_files: *utilities_plugin
 

plugin_1_4.yaml

@@ -3,7 +3,7 @@ plugins:
   cfy_util: &utilities_plugin
     executor: central_deployment_agent
     package_name: cloudify-utilities-plugin
-    package_version: '1.25.11'
+    package_version: '1.25.12'
 
   cfy_files: *utilities_plugin
 

v2_plugin.yaml

@@ -3,7 +3,7 @@ plugins:
   cfy_util: &utilities_plugin
     executor: central_deployment_agent
     package_name: cloudify-utilities-plugin
-    package_version: '1.25.11'
+    package_version: '1.25.12'
 
   cfy_files: *utilities_plugin