From 78168671e78af1de8f870bb6b87a863fbd94374e Mon Sep 17 00:00:00 2001
From: Ananya <anbanerj@redhat.com>
Date: Thu, 20 Oct 2022 14:43:54 +0000
Subject: [PATCH] Revert "Add a separate /boot partition"

This reverts commit 85b7d2360bd90e1728644e86d558f49407219e76.

Reason for revert: Checking if this is breaking c8 c9 wallaby fs001

Change-Id: I6c58019f28682fd9414895a16d9c438b4893b653
---
 .../block-device-default.yaml                        | 12 +-----------
 .../notes/boot-partition-6ad1ce7255b1715e.yaml       |  9 ---------
 2 files changed, 1 insertion(+), 20 deletions(-)
 delete mode 100644 releasenotes/notes/boot-partition-6ad1ce7255b1715e.yaml

diff --git a/elements/overcloud-partition-uefi/block-device-default.yaml b/elements/overcloud-partition-uefi/block-device-default.yaml
index 515a3dd5d..0194d094c 100644
--- a/elements/overcloud-partition-uefi/block-device-default.yaml
+++ b/elements/overcloud-partition-uefi/block-device-default.yaml
@@ -17,19 +17,9 @@
       - name: BSP
         type: 'EF02'
         size: 8MiB
-      - name: boot
-        type: 'BC13C2FF-59E6-4262-A352-B275FD6F7172'
-        size: 500MB
-        mkfs:
-          type: ext4
-          mount:
-            mount_point: /boot
-            fstab:
-              options: "defaults"
-              fsck-passno: 1
       - name: root
         flags: [ boot ]
-        size: 5500MB
+        size: 6G
 - lvm:
     name: lvm
     base: [ root ]
diff --git a/releasenotes/notes/boot-partition-6ad1ce7255b1715e.yaml b/releasenotes/notes/boot-partition-6ad1ce7255b1715e.yaml
deleted file mode 100644
index 5dcbcd386..000000000
--- a/releasenotes/notes/boot-partition-6ad1ce7255b1715e.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
----
-features:
-  - |
-    The overcloud-hardened-uefi-full image now has a separate partition mounted
-    to /boot. This means grub no longer needs to mount the root partition. This
-    will allow trying layouts which grub doesn't support, such as LVM
-    thin-provisioning. Since grub now uses the common path of loading an ext4
-    /boot partition, early boot may now be more robust, or have better error
-    messages for incorrectly built images.