Fixing source_dir configuration

It was not possible to configure source_dir to use
local repositories during build. This configuration
change didn't pass validation because it was deep merged
with default configs.

Change-Id: I3d1f8769fa12dc22b1d7f02a3e84c7b5ecebd521
This commit is contained in:
Andrey Pavlov 2017-01-11 10:30:32 +00:00
parent 38ca18253e
commit 13024df57f
1 changed files with 3 additions and 0 deletions

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