openstack
/
murano
Code Issues Proposed changes

Merge "Removes ability to alter defaults for child objects"

This commit is contained in:
Jenkins 2016-03-19 00:07:37 +00:00 committed by Gerrit Code Review
parent 8d2b5b9cd6 5fcbdccbed
commit d911efe7a9
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
murano/dsl/helpers.py
View File

@ -515,7 +515,7 @@ def resolve_type(value, scope_type, return_reference=False):
def instantiate(data, owner, object_store, context, scope_type,
default_type=None, defaults=None):
default_type=None):
if data is None:
data = {}
if not isinstance(data, yaqlutils.MappingType):
@ -533,7 +533,7 @@ def instantiate(data, owner, object_store, context, scope_type,
owner, object_store, object_store.executor)(
context, **props)
data = evaluate(updated_dict(defaults, data), context, freeze=False)
data = evaluate(data, context, freeze=False)
if '?' not in data:
if not default_type:
raise ValueError('Type information is missing')

2
murano/dsl/type_scheme.py
View File

@ -164,7 +164,7 @@ class TypeScheme(object):
elif isinstance(value, utils.MappingType):
obj = helpers.instantiate(
value, owner, object_store, root_context,
calling_type, default_name, default)
calling_type, default_name)
elif isinstance(value, six.string_types) and object_store:
obj = object_store.get(value)
if obj is None: