diff options
Diffstat (limited to 'patches')
| -rw-r--r-- | patches/fuel-agent/0006-FIXME-Ubuntu-image-s-grub-pc-grub-efi-arm64.patch | 31 | ||||
| -rw-r--r-- | patches/fuel-web/0002-Add-arch-to-nailgun-release-and-target-image.patch | 5 |
2 files changed, 2 insertions, 34 deletions
diff --git a/patches/fuel-agent/0006-FIXME-Ubuntu-image-s-grub-pc-grub-efi-arm64.patch b/patches/fuel-agent/0006-FIXME-Ubuntu-image-s-grub-pc-grub-efi-arm64.patch deleted file mode 100644 index 6dd23060..00000000 --- a/patches/fuel-agent/0006-FIXME-Ubuntu-image-s-grub-pc-grub-efi-arm64.patch +++ /dev/null @@ -1,31 +0,0 @@ -From: Alexandru Avadanii <Alexandru.Avadanii@enea.com> -Date: Tue, 8 Mar 2016 01:06:56 +0100 -Subject: [PATCH] FIXME: Ubuntu image: s/grub-pc/grub-efi-arm64/. - -This patch replaces previously hardcoded 'grub-pc' package -requirement for target image building with 'grub-efi-arm64'. - -Naturally, target image will only support arm64 UEFI-enabled systems. - -Fuel 9.0 moved default package list to openstack.yaml fixture, see [1]. -TODO: At least make this arch-dependant for mos8 ... - -[1] https://github.com/openstack/fuel-web/commit/ - 4ee42effe27694bd231663e3d0f10c0c42877177 ---- - fuel_agent/drivers/nailgun.py | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/fuel_agent/drivers/nailgun.py b/fuel_agent/drivers/nailgun.py -index 0ae81f9..bc532b4 100644 ---- a/fuel_agent/drivers/nailgun.py -+++ b/fuel_agent/drivers/nailgun.py -@@ -684,7 +684,7 @@ class NailgunBuildImage(BaseDataDriver): - "daemonize", - "debconf-utils", - "gdisk", -- "grub-pc", -+ "grub-efi-arm64", - "hpsa-dkms", - "i40e-dkms", - "linux-firmware", 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": |