openstack
/
heat
Code Issues Proposed changes

Merge "Don't override _show_resource() for image"

This commit is contained in:
Jenkins 2017-01-24 21:19:13 +00:00 committed by Gerrit Code Review
parent 8711f80b34 4b25dd6777
commit a27b6cc1e4
2 changed files with 1 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
heat/engine/resource.py
View File

@ -1906,7 +1906,7 @@ class Resource(object):
try:
obj = getattr(self.client(), self.entity)
resource = obj.get(self.resource_id)
if type(resource) == dict:
if isinstance(resource, dict):
return resource
else:
return resource.to_dict()

7
heat/engine/resources/openstack/glance/image.py
View File

@ -244,13 +244,6 @@ class GlanceImage(resource.Resource):
else:
images.update(self.resource_id, **prop_diff)
def _show_resource(self):
if self.glance().version == 1.0:
return super(GlanceImage, self)._show_resource()
else:
image = self.glance().images.get(self.resource_id)
return dict(image)
def validate(self):
super(GlanceImage, self).validate()
container_format = self.properties[self.CONTAINER_FORMAT]