From 7aa32889820f581333f82c5343f1fb8d926306af Mon Sep 17 00:00:00 2001 From: Will Szumski Date: Wed, 6 Dec 2023 11:01:36 +0000 Subject: [PATCH 1/3] Fix growroot when using software raid Using @markgoddard's suggestion from: https://github.com/stackhpc/stackhpc-kayobe-config/pull/770#issuecomment-1814402925 --- 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 cdd7293d9..1d2a3fde3 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' and disk_tmp[:4] == 'nvme' else disk_tmp }}" + disk: "{{ disk_tmp[:-1] if pv.report[0].pv[0].pv_name | regex_search('[a-z0-9]+[0-9]+p[0-9]+') 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 4893e1fdd4ad2ff39cfa1733c48c7310fbe14afa Mon Sep 17 00:00:00 2001 From: Will Szumski Date: Wed, 6 Dec 2023 11:07:21 +0000 Subject: [PATCH 2/3] Add a release note --- .../fixes-growroot-for-software-raid-3852bdea5415a0be.yaml | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 releasenotes/notes/fixes-growroot-for-software-raid-3852bdea5415a0be.yaml diff --git a/releasenotes/notes/fixes-growroot-for-software-raid-3852bdea5415a0be.yaml b/releasenotes/notes/fixes-growroot-for-software-raid-3852bdea5415a0be.yaml new file mode 100644 index 000000000..acfc07164 --- /dev/null +++ b/releasenotes/notes/fixes-growroot-for-software-raid-3852bdea5415a0be.yaml @@ -0,0 +1,5 @@ +--- +fixes: + - | + Fixes a regression when using growroot.yml and software raid where the + playbook would fail to identify the correct disk. From f6e04a77b4cb0308e28ed5d7a69f21d042331013 Mon Sep 17 00:00:00 2001 From: Will Szumski Date: Wed, 13 Dec 2023 10:16:23 +0000 Subject: [PATCH 3/3] Update releasenotes/notes/fixes-growroot-for-software-raid-3852bdea5415a0be.yaml Co-authored-by: Alex-Welsh <112560678+Alex-Welsh@users.noreply.github.com> --- .../fixes-growroot-for-software-raid-3852bdea5415a0be.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/releasenotes/notes/fixes-growroot-for-software-raid-3852bdea5415a0be.yaml b/releasenotes/notes/fixes-growroot-for-software-raid-3852bdea5415a0be.yaml index acfc07164..0f66c6934 100644 --- a/releasenotes/notes/fixes-growroot-for-software-raid-3852bdea5415a0be.yaml +++ b/releasenotes/notes/fixes-growroot-for-software-raid-3852bdea5415a0be.yaml @@ -1,5 +1,5 @@ --- fixes: - | - Fixes a regression when using growroot.yml and software raid where the + Fixes a regression when using ``growroot.yml`` and software raid where the playbook would fail to identify the correct disk.