openstack
/
heat
Code Issues Proposed changes

Merge "Don't dynamically create provider types in the global env"

This commit is contained in:
Jenkins 2014-05-05 21:10:13 +00:00 committed by Gerrit Code Review
parent cc0a8d4597 a02ff20509
commit 88601dcf39
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
heat/engine/environment.py
View File

@ -217,7 +217,10 @@ class ResourceRegistry(object):
registry[name] = info
def iterable_by(self, resource_type, resource_name=None):
if resource_type.endswith(('.yaml', '.template')):
is_templ_type = resource_type.endswith(('.yaml', '.template'))
if self.global_registry is not None and is_templ_type:
# we only support dynamic resource types in user environments
# not the global environment.
# resource with a Type == a template
# we dynamically create an entry as it has not been registered.
if resource_type not in self._registry:

2
heat/tests/test_provider_template.py
View File

@ -427,6 +427,8 @@ class ProviderTemplateTest(HeatTestCase):
{'WordPress_Single_Instance.yaml':
'WordPress_Single_Instance.yaml', 'resources': {}},
stack.env.user_env_as_dict()["resource_registry"])
self.assertNotIn('WordPress_Single_Instance.yaml',
resources.global_env().registry._registry)
def test_persisted_unregistered_provider_templates(self):
"""