aboutsummaryrefslogtreecommitdiffstats
path: root/patches
diff options
context:
space:
mode:
authorAlexandru Avadanii <Alexandru.Avadanii@enea.com>2016-06-10 20:41:27 +0200
committerAlexandru Avadanii <Alexandru.Avadanii@enea.com>2016-06-12 11:27:33 +0000
commit630f938f227275003d092165af5394794c22462e (patch)
tree3c0a60f7dbfde6b53a538726d1451fbeedc0a435 /patches
parenteaf1948214369f3ad4b7fe7639c7d7907ae43195 (diff)
Fix: f-w: Nailgun `current_release` obsoleted.
Upstream fuel-web change "Remove legacy patching code" [1] obsoletes `current_release` definition in `deployment_serializers.py`. Update our nailgun patch that adds arch field to no longer rely on this functionality. [1] https://review.openstack.org/#/c/280708/ Change-Id: I93b3691be860427da320c5c0a2c799dcc4158afd Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Diffstat (limited to 'patches')
-rw-r--r--patches/fuel-web/0002-Add-arch-to-nailgun-release-and-target-image.patch5
1 files changed, 2 insertions, 3 deletions
diff --git a/patches/fuel-web/0002-Add-arch-to-nailgun-release-and-target-image.patch b/patches/fuel-web/0002-Add-arch-to-nailgun-release-and-target-image.patch
index a6e09c13..d621dbdf 100644
--- a/patches/fuel-web/0002-Add-arch-to-nailgun-release-and-target-image.patch
+++ b/patches/fuel-web/0002-Add-arch-to-nailgun-release-and-target-image.patch
@@ -161,13 +161,12 @@ diff --git a/nailgun/nailgun/orchestrator/deployment_serializers.py b/nailgun/na
index 699a599..6bb7990 100644
--- a/nailgun/nailgun/orchestrator/deployment_serializers.py
+++ b/nailgun/nailgun/orchestrator/deployment_serializers.py
-@@ -300,7 +300,14 @@ class DeploymentMultinodeSerializer(object):
+@@ -300,7 +300,13 @@ class DeploymentMultinodeSerializer(object):
img_dir = '/usr/share/cirros-testvm/'
else:
img_dir = '/opt/vm/'
- image_data['img_path'] = '{0}cirros-x86_64-disk.img'.format(img_dir)
-+ release = self.current_release(node.cluster)
-+ arch = release.arch
++ arch = node.cluster.release.arch
+ if arch == "amd64":
+ arch = "x86_64"
+ elif arch == "arm64":