diff options
| author |   Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2016-06-13 11:09:56 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@172.30.200.206> | 2016-06-13 11:09:56 +0000 |
| commit | 35f41326f8ffbdaa8cb3bab57e8831563bf4dd0d (patch) | |
| tree | c851391bca97a0dd3d40e34d3fe355f1938c7d86 | |
| parent | 76bab46026741f401ae8501dd458d90182781b1f (diff) | |
| parent | 630f938f227275003d092165af5394794c22462e (diff) | |
Merge "Fix: f-w: Nailgun `current_release` obsoleted."
| -rw-r--r-- | patches/fuel-web/0002-Add-arch-to-nailgun-release-and-target-image.patch | 5 |
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": |