Fix: f-w: Nailgun `current_release` obsoleted. 93/15393/2
authorAlexandru Avadanii <Alexandru.Avadanii@enea.com>
Fri, 10 Jun 2016 18:41:27 +0000 (20:41 +0200)
committerAlexandru Avadanii <Alexandru.Avadanii@enea.com>
Sun, 12 Jun 2016 11:27:33 +0000 (11:27 +0000)
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>
patches/fuel-web/0002-Add-arch-to-nailgun-release-and-target-image.patch

index a6e09c1..d621dbd 100644 (file)
@@ -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":