Merge pull request #20 from stackhpc/wallaby_soft_raid

Author: cityofships

ansible/group_vars/all/bifrost

@@ -58,6 +58,18 @@ kolla_bifrost_dib_env_vars: "{{ kolla_bifrost_dib_env_vars_default | combine(kol
 # List of DIB packages to install.
 kolla_bifrost_dib_packages: []
 
+###############################################################################
+# Disk image deployment configuration.
+
+# 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.
 

ansible/kolla-bifrost-hostvars.yml

@@ -14,6 +14,8 @@
     ansible_host: "{{ hostvars[seed_host].ansible_host | default(seed_host) }}"
     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 }}"

doc/source/configuration/reference/bifrost.rst

@@ -179,6 +179,22 @@ Rather than needing to write a custom DIB element, we can use the
    kolla_bifrost_dib_packages:
      - "biosdevname"
 
+Disk image deployment configuration
+===================================
+
+The name of the root disk image to deploy can be configured via the
+``kolla_bifrost_deploy_image_filename`` option, which defaults to
+``deployment_image.qcow2``. It can be defined globally in
+``${KAYOBE_CONFIG_PATH}/bifrost.yml``, or defined per-group or per-host in the
+Kayobe inventory. This can be used to provision different images across the
+overcloud.
+
+.. note::
+
+   Support for building multiple disk images is not yet available. Images can
+   be manually renamed before changing the Kayobe configuration to build a
+   different image.
+
 Ironic configuration
 ====================
 
@@ -285,7 +301,7 @@ Inventory configuration
    This feature is currently not well tested. It is advisable to use
    autodiscovery of overcloud servers instead.
 
-The following options are used to configure a static inventory of servers for
+The following option is used to configure a static inventory of servers for
 Bifrost.
 
 ``kolla_bifrost_servers``

etc/kayobe/bifrost.yml

@@ -57,6 +57,18 @@
 # List of DIB packages to install. Default is to install no extra packages.
 #kolla_bifrost_dib_packages:
 
+###############################################################################
+# Disk image deployment configuration.
+
+# 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.
 

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.

releasenotes/notes/bifrost-deploy-image-filename-716c12e71c769a27.yaml

@@ -0,0 +1,6 @@
+---
+features:
+  - |
+    Adds a new ``kolla_bifrost_deploy_image_filename`` variable used to define
+    the name of the root disk image to provision. This may be used to deploy
+    different images on different hosts.