From 8a6eb03d62dab0133ba59fd50654badfb9063e8b Mon Sep 17 00:00:00 2001 From: Angus Salkeld Date: Thu, 5 Apr 2012 09:59:16 +1000 Subject: [PATCH] Pass the parameters to the parser Signed-off-by: Angus Salkeld --- bin/heat-engine | 2 +- heat/api/v1/stacks.py | 3 ++- heat/engine/manager.py | 4 ++-- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/bin/heat-engine b/bin/heat-engine index 70960af4..ae99e518 100755 --- 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 2e5f9029..1378b147 100644 --- 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 d5a51655..bf367226 100644 --- 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}} -- 2.45.2