x
/
fuel-ccp
Code Issues Proposed changes

Merge "Fix merging custom parameters for actions"

This commit is contained in:
Jenkins 2017-03-02 15:59:54 +00:00 committed by Gerrit Code Review
parent f42e4d6b42 019cd01177
commit d0f3185867
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
fuel_ccp/action.py
View File

@ -63,12 +63,12 @@ class Action(object):
# configmap methods
def _create_configmap(self):
CONF.configs._update(action_parameters=self._get_custom_parameters())
data = {
"config": CONF.configs._json(sort_keys=True),
"nodes-config": utils.get_nodes_config(CONF.nodes),
"workflow": self._get_workflow()
}
data["config"]["action_parameters"] = self._get_custom_parameters()
data.update(self._get_file_templates())
cm = templates.serialize_configmap(self.k8s_name, data)