openstack/deb-heat
Code Issues Proposed changes

Merge "Code improvement: avoid reduntant if conditions"

Browse Source
This commit is contained in:
Jenkins 2015-04-30 13:39:32 +00:00 committed by Gerrit Code Review
commit 7c8619a205
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
heat/engine/service.py
View File

@ -578,13 +578,13 @@ class EngineService(service.Service):
stack_user_project_id=None,
convergence=False,
parent_resource_name=None):
# If it is stack-adopt, use parameters from adopt_stack_data
common_params = api.extract_args(args)
if (rpc_api.PARAM_ADOPT_STACK_DATA in common_params and
not cfg.CONF.enable_stack_adopt):
raise exception.NotSupported(feature='Stack Adopt')
# If it is stack-adopt, use parameters from adopt_stack_data
if rpc_api.PARAM_ADOPT_STACK_DATA in common_params:
if not cfg.CONF.enable_stack_adopt:
raise exception.NotSupported(feature='Stack Adopt')
# Override the params with values given with -P option
new_params = common_params[rpc_api.PARAM_ADOPT_STACK_DATA][
'environment'][rpc_api.STACK_PARAMETERS].copy()