From 13024df57f1c10b12f3cfb3098a37b5897ecc365 Mon Sep 17 00:00:00 2001 From: Andrey Pavlov Date: Wed, 11 Jan 2017 10:30:32 +0000 Subject: [PATCH] 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 --- fuel_ccp/config/__init__.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/fuel_ccp/config/__init__.py b/fuel_ccp/config/__init__.py index fe3e69c1..e5e89026 100644 --- a/fuel_ccp/config/__init__.py +++ b/fuel_ccp/config/__init__.py @@ -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