From b3d4103688525b53d3f591f9d80cc45b09ca489d Mon Sep 17 00:00:00 2001 From: ydehtiarov Date: Wed, 12 Oct 2016 16:18:19 +0300 Subject: [PATCH] CCP fetch yaml default intialization fix default fetch config moved into appropriate include file Change-Id: Icc00d17ca99f1c14cd3fcc21b0bb655a9a5afcfa --- fuel_ccp_tests/fixtures/ccp_fixtures.py | 3 +++ fuel_ccp_tests/settings.py | 9 ++++++--- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/fuel_ccp_tests/fixtures/ccp_fixtures.py b/fuel_ccp_tests/fixtures/ccp_fixtures.py index a314626..b2b41e1 100644 --- a/fuel_ccp_tests/fixtures/ccp_fixtures.py +++ b/fuel_ccp_tests/fixtures/ccp_fixtures.py @@ -79,6 +79,9 @@ def ccpcluster(revert_snapshot, config, hardware, ccp_actions.put_yaml_config( path=settings.CCP_SOURCES_CONFIG, config=settings.CCP_BUILD_SOURCES) + ccp_actions.put_yaml_config( + path=settings.CCP_FETCH_CONFIG, + config=settings.CCP_FETCH_PARAMS) with open(settings.TOPOLOGY_PATH, 'r') as f: ccp_actions.put_raw_config( diff --git a/fuel_ccp_tests/settings.py b/fuel_ccp_tests/settings.py index 6e27e3c..d95738d 100644 --- a/fuel_ccp_tests/settings.py +++ b/fuel_ccp_tests/settings.py @@ -166,9 +166,6 @@ CCP_CONF = { 'registry': { 'address': REGISTRY }, - 'repositories': { - 'skip_empty': True - }, 'kubernetes': { 'namespace': 'ccp' }, @@ -182,6 +179,12 @@ CCP_SOURCES_CONFIG = '~/.ccp.build-sources.yaml' CCP_FETCH_CONFIG = '~/.ccp.fetch.yaml' +CCP_FETCH_PARAMS = { + 'repositories': { + 'skip_empty': True + } +} + CCP_BUILD_SOURCES = { 'sources': OS_REPOS }