Merge "Remove stack ObjectField from resource"
This commit is contained in:
commit
0d5ce52a35
@ -1735,7 +1735,7 @@ class EngineService(service.Service):
|
|||||||
raise exception.EntityNotFound(entity='Resource',
|
raise exception.EntityNotFound(entity='Resource',
|
||||||
name=physical_resource_id)
|
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]
|
resource = stack[rs.name]
|
||||||
|
|
||||||
return dict(resource.identifier())
|
return dict(resource.identifier())
|
||||||
|
@ -29,7 +29,6 @@ from heat.db import api as db_api
|
|||||||
from heat.objects import base as heat_base
|
from heat.objects import base as heat_base
|
||||||
from heat.objects import fields as heat_fields
|
from heat.objects import fields as heat_fields
|
||||||
from heat.objects import resource_data
|
from heat.objects import resource_data
|
||||||
from heat.objects import stack
|
|
||||||
|
|
||||||
cfg.CONF.import_opt('encrypt_parameters_and_properties', 'heat.common.config')
|
cfg.CONF.import_opt('encrypt_parameters_and_properties', 'heat.common.config')
|
||||||
|
|
||||||
@ -66,7 +65,6 @@ class Resource(
|
|||||||
resource_data.ResourceData,
|
resource_data.ResourceData,
|
||||||
nullable=True
|
nullable=True
|
||||||
),
|
),
|
||||||
'stack': fields.ObjectField(stack.Stack),
|
|
||||||
'engine_id': fields.StringField(nullable=True),
|
'engine_id': fields.StringField(nullable=True),
|
||||||
'atomic_key': fields.IntegerField(nullable=True),
|
'atomic_key': fields.IntegerField(nullable=True),
|
||||||
'current_template_id': fields.IntegerField(),
|
'current_template_id': fields.IntegerField(),
|
||||||
|
Loading…
Reference in New Issue
Block a user