diff options
| author |   Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2016-06-13 11:10:09 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@172.30.200.206> | 2016-06-13 11:10:09 +0000 |
| commit | de47e68c6e5df97cdf656f7e70cd6e6b0582bd30 (patch) | |
| tree | b9e218ff3816b385360b364fd06a477656dd8096 | |
| parent | 35f41326f8ffbdaa8cb3bab57e8831563bf4dd0d (diff) | |
| parent | e6aeadf741d89446c058804b8737cf87286a6337 (diff) | |
Merge "Cleanup: Drop obsoleted hardcode, now in fixture."
| -rw-r--r-- | patches/fuel-agent/0006-FIXME-Ubuntu-image-s-grub-pc-grub-efi-arm64.patch | 31 |
1 files changed, 0 insertions, 31 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", |