From 4620b80997cf44fc49f7afbda851caff09f1e87d Mon Sep 17 00:00:00 2001
From: technowhizz <7688823+technowhizz@users.noreply.github.com>
Date: Fri, 10 Nov 2023 10:22:41 +0000
Subject: [PATCH 1/2] Fix growroot playbook for disks ending with p

---
 etc/kayobe/ansible/growroot.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/etc/kayobe/ansible/growroot.yml b/etc/kayobe/ansible/growroot.yml
index 54819b4c41..cdd7293d9b 100644
--- a/etc/kayobe/ansible/growroot.yml
+++ b/etc/kayobe/ansible/growroot.yml
@@ -77,7 +77,7 @@
           vars:
             pv: "{{ pvs.stdout | from_json }}"
             disk_tmp: "{{ pv.report[0].pv[0].pv_name[:-1] }}"
-            disk: "{{ disk_tmp[:-1] if disk_tmp[-1] == 'p' else disk_tmp }}"
+            disk: "{{ disk_tmp[:-1] if disk_tmp[-1] == 'p' and disk_tmp[:4] == 'nvme' else disk_tmp }}"
             part_num: "{{ pv.report[0].pv[0].pv_name[-1] }}"
           become: true
           failed_when: "growpart.rc != 0 and 'NOCHANGE' not in growpart.stdout"

From 3e25167344668fab321a9b40321ab968537851ec Mon Sep 17 00:00:00 2001
From: technowhizz <7688823+technowhizz@users.noreply.github.com>
Date: Fri, 10 Nov 2023 10:26:19 +0000
Subject: [PATCH 2/2] Add release note

---
 .../notes/fix-growroot-playbook-6a8ee02d7c0fbcb3.yaml       | 6 ++++++
 1 file changed, 6 insertions(+)
 create mode 100644 releasenotes/notes/fix-growroot-playbook-6a8ee02d7c0fbcb3.yaml

diff --git a/releasenotes/notes/fix-growroot-playbook-6a8ee02d7c0fbcb3.yaml b/releasenotes/notes/fix-growroot-playbook-6a8ee02d7c0fbcb3.yaml
new file mode 100644
index 0000000000..f3e4b84d22
--- /dev/null
+++ b/releasenotes/notes/fix-growroot-playbook-6a8ee02d7c0fbcb3.yaml
@@ -0,0 +1,6 @@
+---
+fixes:
+  - |
+    Fixes an issue with the growroot playbook where disks such as 'sdp' would
+    become 'sd' due to the removal of the trailing 'p' when dealing with nvme
+    devices.