From 5da9d81a2d3a89e39818afe418d40151e620386d Mon Sep 17 00:00:00 2001 From: Andrey Pavlov Date: Sun, 5 Mar 2017 18:41:59 +0000 Subject: [PATCH] Fixing upgrades * fixing upgrade jobs naming * adding configmap with per-service configuration Change-Id: I708540d39666465cf1ecd446e85198a9080468c5 --- fuel_ccp/deploy.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/fuel_ccp/deploy.py b/fuel_ccp/deploy.py index fa6b4416..ce0c738a 100644 --- a/fuel_ccp/deploy.py +++ b/fuel_ccp/deploy.py @@ -556,6 +556,7 @@ def create_upgrade_jobs(component_name, upgrade_data, configmaps, topology, "exports_ctx": exports_ctx, } _create_meta_configmap(service) + _create_service_configmap(prefix) workflows = {prefix: ""} jobs = container["pre"] @@ -564,7 +565,7 @@ def create_upgrade_jobs(component_name, upgrade_data, configmaps, topology, for step in upgrade_def['steps']: step_type = step.get('type', 'single') job_name = "{}-{}".format(prefix, step['name']) - job = {"name": job_name, "type": "single"} + job = {"name": step['name'], "type": "single"} for key in ['files', 'volumes', 'topology_key']: if step.get(key): job[key] = step[key] @@ -596,7 +597,7 @@ def create_upgrade_jobs(component_name, upgrade_data, configmaps, topology, kill.append(object_dict) else: raise RuntimeError("Unsupported upgrade step type: %s" % step_type) - workflows[job_name] = \ + workflows[step['name']] = \ json.dumps({'workflow': workflow}, sort_keys=True) _create_workflow(workflows, prefix)