From 04d97cda85cb95714e39a701070ca8ef97a5e869 Mon Sep 17 00:00:00 2001
From: Piotr Parczewski <piotr@stackhpc.com>
Date: Tue, 30 Nov 2021 12:18:19 +0100
Subject: [PATCH] Add support for root filesystem UUID customisation

Depends-on: https://review.opendev.org/c/openstack/bifrost/+/819785
Change-Id: I37b9d18f0523c121357c5a37ec6fc458209f8e79
---
 ansible/group_vars/all/bifrost                              | 6 ++++++
 ansible/kolla-bifrost-hostvars.yml                          | 1 +
 etc/kayobe/bifrost.yml                                      | 6 ++++++
 .../notes/add-support-for-rootfs-uuid-42f0c551a383799b.yaml | 6 ++++++
 4 files changed, 19 insertions(+)
 create mode 100644 releasenotes/notes/add-support-for-rootfs-uuid-42f0c551a383799b.yaml

diff --git a/ansible/group_vars/all/bifrost b/ansible/group_vars/all/bifrost
index 735fbb733..c24ca67d3 100644
--- a/ansible/group_vars/all/bifrost
+++ b/ansible/group_vars/all/bifrost
@@ -65,6 +65,12 @@ kolla_bifrost_dib_packages: []
 # Name of disk image file to deploy. Default is "deployment_image.qcow2".
 kolla_bifrost_deploy_image_filename: "deployment_image.qcow2"
 
+# UUID of the root filesystem contained within the deployment image.
+# See below URL for instructions on how to extract it:
+# https://docs.openstack.org/ironic/latest/admin/raid.html#image-requirements
+# Default is none.
+kolla_bifrost_deploy_image_rootfs:
+
 ###############################################################################
 # Ironic configuration.
 
diff --git a/ansible/kolla-bifrost-hostvars.yml b/ansible/kolla-bifrost-hostvars.yml
index 3926f8f93..e43bcd7e6 100644
--- a/ansible/kolla-bifrost-hostvars.yml
+++ b/ansible/kolla-bifrost-hostvars.yml
@@ -15,6 +15,7 @@
     bifrost_hostvars:
       addressing_mode: static
       deploy_image_filename: "{{ kolla_bifrost_deploy_image_filename }}"
+      deploy_image_rootfs: "{{ kolla_bifrost_deploy_image_rootfs | default(omit, true) }}"
       ipv4_interface_mac: "{% raw %}{{ extra.pxe_interface_mac | default }}{% endraw %}"
       ipv4_address: "{{ admin_oc_net_name | net_ip }}"
       ipv4_subnet_mask: "{{ admin_oc_net_name | net_mask }}"
diff --git a/etc/kayobe/bifrost.yml b/etc/kayobe/bifrost.yml
index 9cabe8121..a9eba19dd 100644
--- a/etc/kayobe/bifrost.yml
+++ b/etc/kayobe/bifrost.yml
@@ -65,6 +65,12 @@
 # Name of disk image file to deploy. Default is "deployment_image.qcow2".
 #kolla_bifrost_deploy_image_filename:
 
+# UUID of the root filesystem contained within the deployment image.
+# See below URL for instructions on how to extract it:
+# https://docs.openstack.org/ironic/latest/admin/raid.html#image-requirements
+# Default is none.
+#kolla_bifrost_deploy_image_rootfs:
+
 ###############################################################################
 # Ironic configuration.
 
diff --git a/releasenotes/notes/add-support-for-rootfs-uuid-42f0c551a383799b.yaml b/releasenotes/notes/add-support-for-rootfs-uuid-42f0c551a383799b.yaml
new file mode 100644
index 000000000..413adbf20
--- /dev/null
+++ b/releasenotes/notes/add-support-for-rootfs-uuid-42f0c551a383799b.yaml
@@ -0,0 +1,6 @@
+---
+features:
+  - |
+    Adds support for setting root filesystem's UUID via a new variable
+    ``kolla_bifrost_deploy_image_rootfs``. This is useful when deploying
+    overcloud hosts with software RAID based root disk devices.