x
/
fuel-ccp-tests
Code Issues Proposed changes

Merge "CCP fetch yaml default intialization fix"

This commit is contained in:
Jenkins 2016-10-12 13:39:37 +00:00 committed by Gerrit Code Review
parent 12a24fb332 b3d4103688
commit 78050f479b
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
fuel_ccp_tests/fixtures/ccp_fixtures.py
View File

@ -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(

9
fuel_ccp_tests/settings.py
View File

@ -168,9 +168,6 @@ CCP_CONF = {
'registry': {
'address': REGISTRY
},
'repositories': {
'skip_empty': True
},
'kubernetes': {
'namespace': 'ccp'
},
@ -184,6 +181,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
}