From b4129dd549a054351b545879372728d28b1b7c10 Mon Sep 17 00:00:00 2001 From: Dmitry Bilunov Date: Wed, 24 Feb 2016 16:38:54 +0300 Subject: [PATCH] Send cluster id for pre provision task obviously Orchestrator implements a method called `calculate_cluster_id', which extracts cluster id from the log file name that is supplied in the `cmd' field of the parameters hash from pre_provision property of provisioning info. We should send cluster id in a separate field (`cluster_id') instead of inferring it from the string representation of the command. Change-Id: Ia33810525707fa63985be019096dc9e78c81c812 Partial-Bug: #1449512 --- nailgun/nailgun/orchestrator/tasks_templates.py | 1 + 1 file changed, 1 insertion(+) diff --git a/nailgun/nailgun/orchestrator/tasks_templates.py b/nailgun/nailgun/orchestrator/tasks_templates.py index b608008866..bc542eaeaf 100644 --- a/nailgun/nailgun/orchestrator/tasks_templates.py +++ b/nailgun/nailgun/orchestrator/tasks_templates.py @@ -226,6 +226,7 @@ def make_provisioning_images_task( return make_shell_task(uids, { 'parameters': { + 'cluster_id': cid, 'cmd': ("fa_build_image " "--image_build_dir /var/lib/fuel/ibp " "--log-file /var/log/fuel-agent-env-{0}.log "