x
/
fuel-ccp
Code Issues Proposed changes

Fixing upgrades 

* fixing upgrade jobs naming
* adding configmap with per-service configuration

Change-Id: I708540d39666465cf1ecd446e85198a9080468c5
This commit is contained in:
Andrey Pavlov 2017-03-05 18:41:59 +00:00
parent a5083dc520
commit 5da9d81a2d
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
fuel_ccp/deploy.py
View File

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