From 50f5142eca3fcff27730afcc4fb2b179934867f3 Mon Sep 17 00:00:00 2001 From: Steve Baker Date: Tue, 10 May 2016 17:35:15 +1200 Subject: [PATCH] Remove stack ObjectField from resource This causes the stack record to be loaded every time a resource is loaded, and it is not used for anything other than getting the stack ID, which is already available via the stack_id field. Change-Id: I45ce9d18984f4881151dba496482713a62c9eae9 Partial-Bug: #1578854 --- heat/engine/service.py | 2 +- heat/objects/resource.py | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/heat/engine/service.py b/heat/engine/service.py index 6ad49e25bd..d616e358c0 100644 --- a/heat/engine/service.py +++ b/heat/engine/service.py @@ -1735,7 +1735,7 @@ class EngineService(service.Service): raise exception.EntityNotFound(entity='Resource', name=physical_resource_id) - stack = parser.Stack.load(cnxt, stack_id=rs.stack.id) + stack = parser.Stack.load(cnxt, stack_id=rs.stack_id) resource = stack[rs.name] return dict(resource.identifier()) diff --git a/heat/objects/resource.py b/heat/objects/resource.py index c3f13fa524..f32633c40a 100644 --- a/heat/objects/resource.py +++ b/heat/objects/resource.py @@ -29,7 +29,6 @@ from heat.db import api as db_api from heat.objects import base as heat_base from heat.objects import fields as heat_fields from heat.objects import resource_data -from heat.objects import stack cfg.CONF.import_opt('encrypt_parameters_and_properties', 'heat.common.config') @@ -66,7 +65,6 @@ class Resource( resource_data.ResourceData, nullable=True ), - 'stack': fields.ObjectField(stack.Stack), 'engine_id': fields.StringField(nullable=True), 'atomic_key': fields.IntegerField(nullable=True), 'current_template_id': fields.IntegerField(),