Cleanup: Drop obsoleted hardcode, now in fixture. 01/15401/1
authorAlexandru Avadanii <Alexandru.Avadanii@enea.com>
Fri, 10 Jun 2016 20:43:47 +0000 (22:43 +0200)
committerAlexandru Avadanii <Alexandru.Avadanii@enea.com>
Fri, 10 Jun 2016 20:43:47 +0000 (22:43 +0200)
We used to change the harcoded grub-pc with grub-efi-arm64, but
since Mitaka now adds package list overrides in fixtures [1], we
may remove this obsolete patch.

[1] https://github.com/openstack/fuel-web/commit/
    4ee42effe27694bd231663e3d0f10c0c42877177

Change-Id: I6707b4dbf3823f356c7ff2367215a41e287b80ac
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
patches/fuel-agent/0006-FIXME-Ubuntu-image-s-grub-pc-grub-efi-arm64.patch [deleted file]

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 (file)
index 6dd2306..0000000
+++ /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",