openstack
/
heat
Code Issues Proposed changes

Merge "Format error on urlfetch.get fail"

This commit is contained in:
Jenkins 2013-09-24 18:18:59 +00:00 committed by Gerrit Code Review
parent 32178a06aa 51f46c57e2
commit 14ea3dbd56
1 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
heat/engine/resources/stack.py
View File

@ -13,6 +13,8 @@
# License for the specific language governing permissions and limitations
# under the License.
from requests import exceptions
from heat.common import exception
from heat.common import template_format
from heat.common import urlfetch
@ -54,7 +56,12 @@ class NestedStack(stack_resource.StackResource):
PROP_PARAMETERS)
def handle_create(self):
template_data = urlfetch.get(self.properties[PROP_TEMPLATE_URL])
try:
template_data = urlfetch.get(self.properties[PROP_TEMPLATE_URL])
except (exceptions.RequestException, IOError) as r_exc:
raise ValueError("Could not fetch remote template '%s': %s" %
(self.properties[PROP_TEMPLATE_URL], str(r_exc)))
template = template_format.parse(template_data)
return self.create_with_template(template,
@ -80,7 +87,12 @@ class NestedStack(stack_resource.StackResource):
self.stack.resolve_runtime_data,
self.name)
template_data = urlfetch.get(self.properties[PROP_TEMPLATE_URL])
try:
template_data = urlfetch.get(self.properties[PROP_TEMPLATE_URL])
except (exceptions.RequestException, IOError) as r_exc:
raise ValueError("Could not fetch remote template '%s': %s" %
(self.properties[PROP_TEMPLATE_URL], str(r_exc)))
template = template_format.parse(template_data)
return self.update_with_template(template,