openstack
/
fuel-web
Code Issues Proposed changes

Merge "Disabling strict attributes fetching in legacy expressions"

This commit is contained in:
Jenkins 2016-03-31 15:31:44 +00:00 committed by Gerrit Code Review
parent a4e79ff095 141e07e0e6
commit d7e40799f1
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
nailgun/nailgun/lcm/task_serializer.py
View File

@ -85,9 +85,9 @@ class Context(object):
}
def evaluate(condition):
return Expression(
Context.transform_legacy_condition(condition), context
).evaluate()
return Expression(Context.transform_legacy_condition(condition),
context,
strict=False).evaluate()
return evaluate

5
nailgun/nailgun/orchestrator/tasks_serializer.py
View File

@ -63,8 +63,9 @@ class ExpressionBasedTask(DeploymentHook):
def should_execute(self):
if 'condition' not in self.task:
return True
return Expression(
self.task['condition'], self._expression_context).evaluate()
return Expression(self.task['condition'],
self._expression_context,
strict=False).evaluate()
class GenericNodeHook(ExpressionBasedTask):