x
/
fuel-ccp
Code Issues Proposed changes

Merge "Fixing source_dir configuration"

This commit is contained in:
Jenkins 2017-01-13 09:09:13 +00:00 committed by Gerrit Code Review
parent f1788a9803 13024df57f
commit ee8587f66a
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
fuel_ccp/config/__init__.py
View File

@ -135,6 +135,9 @@ def load_component_defaults():
new_config['configs'][
'cluster_domain'] = _REAL_CONF.kubernetes.cluster_domain
new_config._merge(_REAL_CONF)
# FIXME workaround to not deep merge 'sources' config
for k, v in _REAL_CONF.sources._items():
new_config['sources'][k] = v
_REAL_CONF = new_config