Merge "Support configuration of Bifrost's Ironic extra kernel parameters"

ansible/group_vars/all/bifrost

@@ -55,6 +55,10 @@ kolla_bifrost_dib_packages: []
 kolla_bifrost_enabled_hardware_types:
   - ipmi
 
+# List of extra kernel parameters for Bifrost's Ironic PXE configuration.
+# Default is empty.
+kolla_bifrost_extra_kernel_options: []
+
 ###############################################################################
 # Ironic Inspector configuration.
 

ansible/roles/kolla-bifrost/defaults/main.yml

@@ -23,6 +23,10 @@ kolla_bifrost_dib_packages: []
 # List of hardware types to enable for Bifrost's Ironic.
 kolla_bifrost_enabled_hardware_types: []
 
+# List of extra kernel parameters for Bifrost's Ironic PXE configuration.
+# Default is empty.
+kolla_bifrost_extra_kernel_options: []
+
 # IP address range for DHCP.
 kolla_bifrost_dhcp_pool_start:
 kolla_bifrost_dhcp_pool_end:

ansible/roles/kolla-bifrost/templates/bifrost.yml.j2

@@ -2,6 +2,12 @@
 # List of enabled Ironic hardware types.
 enabled_hardware_types: "{{ kolla_bifrost_enabled_hardware_types | join(',') }}"
 
+{% if kolla_bifrost_extra_kernel_options %}
+# List of extra kernel parameters for Bifrost's Ironic PXE configuration.
+# Default is empty.
+extra_kernel_options: "{{ kolla_bifrost_extra_kernel_options }}"
+{% endif %}
+
 # IP address range for DHCP.
 dhcp_pool_start: "{{ kolla_bifrost_dhcp_pool_start }}"
 dhcp_pool_end: "{{ kolla_bifrost_dhcp_pool_end }}"

doc/source/configuration/bifrost.rst

@@ -187,6 +187,10 @@ container.
 ``kolla_bifrost_enabled_hardware_types``
     List of :ironic-doc:`hardware types <admin/drivers>` to enable for
     Bifrost's Ironic. Default is ``["ipmi"]``.
+``kolla_bifrost_extra_kernel_options``
+    List of :ironic-doc:`extra kernel parameters
+    <install/advanced.html#appending-kernel-parameters-to-boot-instances>` for
+    Bifrost's Ironic PXE configuration.  Default is none.
 
 Ironic Inspector configuration
 ==============================

etc/kayobe/bifrost.yml

@@ -54,6 +54,10 @@
 # List of hardware types to enable for Bifrost's Ironic.
 #kolla_bifrost_enabled_hardware_types:
 
+# List of extra kernel parameters for Bifrost's Ironic PXE configuration.
+# Default is empty.
+#kolla_bifrost_extra_kernel_options:
+
 ###############################################################################
 # Ironic Inspector configuration.
 

releasenotes/notes/bifrost-ironic-extra-kernel-params-e3e56a9dcdf24bb6.yaml

@@ -0,0 +1,7 @@
+---
+features:
+  - |
+    Adds a new configuration variable, ``kolla_bifrost_extra_kernel_options``,
+    which allows to provide a list of extra kernel parameters for Bifrost's
+    Ironic PXE configuration. It defaults to an empty list. See `story 2001987
+    <https://storyboard.openstack.org/#!/story/2001987>`__ for details.