Pass the parameters to the parser

Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

diff --git a/bin/heat-engine b/bin/heat-engine
index 70960af40f74e1892f8350ffe66a4094ae624114..ae99e518a8caeb97c40bf7d0373fa2d4cfa7c617 100755 (executable)
--- a/bin/heat-engine
+++ b/bin/heat-engine
@@ -39,8 +39,8 @@ if os.path.exists(os.path.join(POSSIBLE_TOPDIR, 'heat', '__init__.py')):
 gettext.install('heat', unicode=1)
 
 from heat import service
-from heat.common import utils
 from heat.common import config
+from heat.common import utils
 from heat.db import api as db_api
 
 logger = logging.getLogger('heat.engine')

diff --git a/heat/api/v1/stacks.py b/heat/api/v1/stacks.py
index 2e5f9029330ab8ec280d79c9e3dddafa55ed2e21..1378b147a75e9d453c8a54ac781db16956e4b2d6 100644 (file)
--- a/heat/api/v1/stacks.py
+++ b/heat/api/v1/stacks.py
@@ -128,7 +128,8 @@ class StackController(object):
         return rpc.call(con, 'engine',
                         {'method': 'create_stack',
                          'args': {'stack_name': req.params['StackName'],
-                                  'template': stack}})
+                                  'template': stack,
+                                  'params': dict(req.params)}})
 
     def validate_template(self, req):
 

diff --git a/heat/engine/manager.py b/heat/engine/manager.py
index d5a5165598a115babde0684beda1e677ee7cbdfe..bf36722699c2b6839f56a1d94c34bbd348259ce0 100644 (file)
--- a/heat/engine/manager.py
+++ b/heat/engine/manager.py
@@ -91,12 +91,12 @@ class EngineManager(manager.Manager):
 
         return res
 
-    def create_stack(self, context, stack_name, template):
+    def create_stack(self, context, stack_name, template, params):
         if stack_db.has_key(stack_name):
             return {'Error': 'Stack already exists with that name.'}
 
         logger.info('template is %s' % template)
-        stack_db[stack_name] = parser.Stack(stack_name, template)
+        stack_db[stack_name] = parser.Stack(stack_name, template, params)
         stack_db[stack_name].start()
 
         return {'stack': {'id': stack_name}}