Merge "Migrate to cpp conf file"

fuel_ccp_tests/fixtures/ccp_fixtures.py

@@ -67,7 +67,7 @@ def ccpcluster(revert_snapshot, config, hardware,
     if config.ccp.os_host == '0.0.0.0':
         ccp_actions.install_ccp()
         ccp_actions.put_yaml_config(
-            settings.CCP_CLI_PARAMS['deploy-config'],
+            settings.DEPLOY_CONFIG,
             settings.CCP_DEFAULT_GLOBALS)
         ccp_actions.init_default_config()
         config.ccp.os_host = config.k8s.kube_host

fuel_ccp_tests/managers/ccpmanager.py

@@ -21,10 +21,6 @@ from fuel_ccp_tests import logger
 
 LOG = logger.logger
 
-CCP_CONF = """
-use_stderr: False
-"""
-
 
 class CCPManager(object):
     """docstring for CCPManager"""
@@ -59,7 +55,8 @@ class CCPManager(object):
             if use_defaults:
                 LOG.info("Use defaults config from ccp")
                 cmd = ('cat fuel-ccp/etc/topology-example.yaml '
-                       '>> /tmp/ccp-globals.yaml')
+                       '>> {deploy_config}').format(
+                           deploy_config=settings.DEPLOY_CONFIG)
                 remote.check_call(cmd, verbose=True)
 
     @property
@@ -73,7 +70,7 @@ class CCPManager(object):
         self._default_params = v.copy()
 
     def init_default_config(self):
-        self.put_raw_config('~/.ccp.yaml', CCP_CONF)
+        self.put_yaml_config('~/.ccp.yaml', settings.CCP_CONF)
 
     def put_raw_config(self, path, content):
         """Put config content to file on admin node at path

fuel_ccp_tests/settings.py

@@ -104,7 +104,7 @@ for key, val in CALICO.items():
         DEFAULT_CUSTOM_YAML[key] = val
 
 BUILD_IMAGES = get_var_as_bool('BUILD_IMAGES', True)
-REGISTRY = os.environ.get('REGISTRY')
+REGISTRY = os.environ.get('REGISTRY', "127.0.0.1:31500")
 IMAGES_NAMESPACE = os.environ.get('IMAGES_NAMESPACE', 'mcp')
 IMAGES_TAG = os.environ.get('IMAGES_TAG', 'latest')
 # For dnsmasq purposes
@@ -115,23 +115,38 @@ SERVICE_PATH = os.environ.get('SERVICE_PATH')
 TEMPEST_SCRIPT_PATH = os.environ.get('TEMPEST_SCRIPT_PATH')
 SEARCH_DOMAINS = os.environ.get('SEARCH_DOMAINS',
                                 'ccp.svc.cluster.local').split(',')
-BUILDER_WORKERS = os.environ.get('BUILDER_WORKERS', '1')
+BUILDER_WORKERS = os.environ.get('BUILDER_WORKERS', 1)
+DEPLOY_CONFIG = '/tmp/ccp-globals.yaml'
 
 FUEL_CCP_KEYSTONE_LOCAL_REPO = os.environ.get('FUEL_CCP_KEYSTONE_LOCAL_REPO',
                                               None)
 
+CCP_CONF = {
+    'use_stderr': False,
+    'builder': {
+        'workers': BUILDER_WORKERS,
+        'push': True
+    },
+    'registry': {
+        'address': REGISTRY
+    },
+    'repositories': {
+        'skip_empty': True
+    },
+    'kubernetes': {
+        'namespace': 'ccp'
+    },
+    'deploy_config': DEPLOY_CONFIG,
+    'images': {
+        'namespace': IMAGES_NAMESPACE,
+        'tag': IMAGES_TAG
+    }
+}
+
 CCP_CLI_PARAMS = {
     "config-file": "~/.ccp.yaml",
     "debug": "",
     "log-file": "ccp.log",
-    "builder-workers": BUILDER_WORKERS,
-    "builder-push": "",
-    "registry-address": REGISTRY or "127.0.0.1:31500",
-    "kubernetes-namespace": "ccp",
-    "repositories-skip-empty": "",
-    "deploy-config": "/tmp/ccp-globals.yaml",
-    "images-namespace": IMAGES_NAMESPACE,
-    "images-tag": IMAGES_TAG
 }
 
 CCP_DEFAULT_GLOBALS = {