openstack/deb-murano
Code Issues Proposed changes

Merge "Subsequent stack updates for Heat have proper set of parameters"

Browse Source
This commit is contained in:
Jenkins 2014-06-04 14:52:34 +00:00 committed by Gerrit Code Review
commit 7ae7eeebdc
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
murano/engine/system/heat_stack.py
View File

@ -18,9 +18,7 @@ import heatclient.client as hclient
import heatclient.exc as heat_exc import heatclient.exc as heat_exc
import keystoneclient.v2_0.client as ksclient import keystoneclient.v2_0.client as ksclient
import murano.common.config as config import murano.common.config as config
import murano.dsl.helpers as helpers import murano.dsl.helpers as helpers
import murano.dsl.murano_class as murano_class import murano.dsl.murano_class as murano_class
import murano.dsl.murano_object as murano_object import murano.dsl.murano_object as murano_object
@ -80,7 +78,8 @@ class HeatStack(murano_object.MuranoObject):
stack_info.id)) stack_info.id))
# template = {} # template = {}
self._template = template self._template = template
self._parameters.update(stack_info.parameters) self._parameters.update(
HeatStack._remove_system_params(stack_info.parameters))
self._applied = True self._applied = True
return self._template.copy() return self._template.copy()
except heat_exc.HTTPNotFound: except heat_exc.HTTPNotFound:
@ -112,6 +111,11 @@ class HeatStack(murano_object.MuranoObject):
self._template = helpers.merge_dicts(self._template, template) self._template = helpers.merge_dicts(self._template, template)
self._applied = False self._applied = False
@staticmethod
def _remove_system_params(parameters):
return {k: v for k, v in parameters.iteritems() if
not k.startswith("OS::")}
def _get_status(self): def _get_status(self):
status = [None] status = [None]