From 306aebad48133348692d7126d3843c2a231090ba Mon Sep 17 00:00:00 2001
From: Ilya Etingof <etingof@gmail.com>
Date: Tue, 14 May 2019 14:08:13 +0200
Subject: [PATCH] Fix GRUB config path when building EFI ISO

Fixes GRUB configuration file generation procedure when building
bootable ISO images that include user EFI boot loader image.
Prior to this fix, no bootable ISO image could be generated
unless EFI boot loader is extracted from deploy ISO image.

Change-Id: I1a761737958662cef45885e54cf7532babae1ee1
Story: 2005738
Task: 33399
---
 ironic/common/images.py                                    | 3 +--
 ironic/tests/unit/common/test_images.py                    | 1 -
 releasenotes/notes/fix-esp-grub-path-9e5532993dccc07a.yaml | 7 +++++++
 3 files changed, 8 insertions(+), 3 deletions(-)
 create mode 100644 releasenotes/notes/fix-esp-grub-path-9e5532993dccc07a.yaml

diff --git a/ironic/common/images.py b/ironic/common/images.py
index 833d76f665..5b60a99c93 100644
--- a/ironic/common/images.py
+++ b/ironic/common/images.py
@@ -274,8 +274,7 @@ def create_isolinux_image_for_uefi(output_file, kernel, ramdisk,
                 grub_cfg = os.path.join(tmpdir, grub_rel_path)
 
                 uefi_path_info = {
-                    esp_image: e_img_rel_path,
-                    grub_cfg: grub_rel_path
+                    esp_image: e_img_rel_path
                 }
 
             else:
diff --git a/ironic/tests/unit/common/test_images.py b/ironic/tests/unit/common/test_images.py
index a62289ab67..2b84974487 100644
--- a/ironic/tests/unit/common/test_images.py
+++ b/ironic/tests/unit/common/test_images.py
@@ -549,7 +549,6 @@ class FsImageTestCase(base.TestCase):
             'path/to/kernel': 'vmlinuz',
             'path/to/ramdisk': 'initrd',
             'sourceabspath/to/efiboot.img': 'boot/grub/efiboot.img',
-            'tmpdir/boot/grub/grub.cfg': 'boot/grub/grub.cfg'
         }
 
         grubcfg = "grubcfg"
diff --git a/releasenotes/notes/fix-esp-grub-path-9e5532993dccc07a.yaml b/releasenotes/notes/fix-esp-grub-path-9e5532993dccc07a.yaml
new file mode 100644
index 0000000000..84a3e0f8d1
--- /dev/null
+++ b/releasenotes/notes/fix-esp-grub-path-9e5532993dccc07a.yaml
@@ -0,0 +1,7 @@
+---
+fixes:
+  - |
+    Fixes GRUB configuration file generation procedure when building
+    bootable ISO images that include user EFI boot loader image.
+    Prior to this fix, no bootable ISO image could be generated unless
+    EFI boot loader is extracted from deploy ISO image.