From: Steve Baker <sbaker@redhat.com>
Date: Fri, 17 May 2013 01:47:28 +0000 (+1200)
Subject: Initialise resources when service is created.
X-Git-Tag: 2014.1~598^2
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=1e46684b454ec2e6a75933de11b78e7957f3b5f2;p=openstack-build%2Fheat-build.git

Initialise resources when service is created.

Without this, calls to validate_template will fail until the first
parser.Stack is created.

resources.initialise() is called in EngineService __init__
to avoid this happening in another service method in the future
Fixes: bug #1181045

Change-Id: I68a74ec7993aff4b74d449a3ae33315b93e9cb0d
---

diff --git a/heat/engine/service.py b/heat/engine/service.py
index ac5e8a05..e05d438a 100644
--- a/heat/engine/service.py
+++ b/heat/engine/service.py
@@ -30,6 +30,7 @@ from heat.engine import parameters
 from heat.engine import parser
 from heat.engine import properties
 from heat.engine import resource
+from heat.engine import resources
 from heat.engine import watchrule
 
 from heat.openstack.common import log as logging
@@ -65,6 +66,7 @@ class EngineService(service.Service):
         super(EngineService, self).__init__(host, topic)
         # stg == "Stack Thread Groups"
         self.stg = {}
+        resources.initialise()
 
     def _start_in_thread(self, stack_id, func, *args, **kwargs):
         if stack_id not in self.stg: