diff --git a/murano/dsl/helpers.py b/murano/dsl/helpers.py index c30923cd..2d8168bf 100644 --- a/murano/dsl/helpers.py +++ b/murano/dsl/helpers.py @@ -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') diff --git a/murano/dsl/type_scheme.py b/murano/dsl/type_scheme.py index 41bcee14..b73df9d6 100644 --- a/murano/dsl/type_scheme.py +++ b/murano/dsl/type_scheme.py @@ -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: