openstack
/
heat
Code Issues Proposed changes

Merge "Use constants for URL schemes in template_resource"

This commit is contained in:
Jenkins 2015-12-07 17:31:27 +00:00 committed by Gerrit Code Review
parent d510761f81 734c63c563
commit 2467d83377
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
heat/engine/resources/template_resource.py
View File

@ -27,12 +27,16 @@ from heat.engine.resources import stack_resource
from heat.engine import template
REMOTE_SCHEMES = ('http', 'https')
LOCAL_SCHEMES = ('file',)
def generate_class(name, template_name, env, files=None):
data = None
if files is not None:
data = files.get(template_name)
if data is None:
data = TemplateResource.get_template_file(template_name, ('file',))
data = TemplateResource.get_template_file(template_name, LOCAL_SCHEMES)
return generate_class_from_template(name, data, env)
@ -84,9 +88,9 @@ class TemplateResource(stack_resource.StackResource):
self.resource_type = tri.name
self.resource_path = tri.path
if tri.user_resource:
self.allowed_schemes = ('http', 'https')
self.allowed_schemes = REMOTE_SCHEMES
else:
self.allowed_schemes = ('http', 'https', 'file')
self.allowed_schemes = REMOTE_SCHEMES + LOCAL_SCHEMES
return tri