Merge "Add redfish pxe args for virtual media"

ansible/inventory/group_vars/all/ironic

@@ -101,20 +101,27 @@ kolla_ironic_inspection_network: "{{ kolla_ironic_provisioning_network if inspec
 kolla_ironic_provisioning_network: 'provision-net'
 
 # List of default kernel parameters to append for baremetal PXE boot.
-kolla_ironic_pxe_append_params_default:
+kolla_ironic_pxe_append_params_default: "{{ kolla_ironic_kernel_append_params_default }}"
+
+# List of additional kernel parameters to append for baremetal PXE boot.
+kolla_ironic_pxe_append_params_extra: "{{ kolla_ironic_kernel_append_params_extra }}"
+
+# List of kernel parameters to append for baremetal PXE boot.
+kolla_ironic_pxe_append_params: "{{ kolla_ironic_pxe_append_params_default + kolla_ironic_pxe_append_params_extra }}"
+
+# List of default kernel parameters to append for baremetal boot.
+kolla_ironic_kernel_append_params_default:
   - nofb
   - nomodeset
   - vga=normal
   - console=tty0
   - console=ttyS0,115200n8
 
-# List of additional kernel parameters to append for baremetal PXE boot.
-kolla_ironic_pxe_append_params_extra: []
+# List of additional kernel parameters to append for baremetal boot.
+kolla_ironic_kernel_append_params_extra: []
 
-# List of kernel parameters to append for baremetal PXE boot.
-kolla_ironic_pxe_append_params: >
-  {{ kolla_ironic_pxe_append_params_default +
-     kolla_ironic_pxe_append_params_extra }}
+# List of kernel parameters to append for baremetal boot.
+kolla_ironic_kernel_append_params: "{{ kolla_ironic_kernel_append_params_default + kolla_ironic_kernel_append_params_extra }}"
 
 ###############################################################################
 # Ironic Node Configuration

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

@@ -553,7 +553,10 @@ kolla_ironic_inspection_network:
 # Name or UUID of the Neutron network to use for provisioning.
 kolla_ironic_provisioning_network:
 
-# List of additional append parameters for baremetal PXE boot.
+# List of additional append parameters for baremetal boot.
+kolla_ironic_kernel_append_params: []
+
+#List of additional append parameters for baremetal PXE boot.
 kolla_ironic_pxe_append_params: []
 
 # Deprecated:

ansible/roles/kolla-openstack/templates/kolla/config/ironic.conf

@@ -18,6 +18,11 @@ enabled_hardware_types: {{ kolla_ironic_enabled_hardware_types | join(',') }}
 [agent]
 deploy_logs_local_path = /var/log/kolla/ironic/deploy
 
+[redfish]
+{% if kolla_ironic_kernel_append_params %}
+kernel_append_params = {{ kolla_ironic_kernel_append_params | join(' ') }}
+{% endif %}
+
 [neutron]
 cleaning_network = {{ kolla_ironic_cleaning_network }}
 inspection_network = {{ kolla_ironic_inspection_network }}

doc/source/configuration/reference/ironic-python-agent.rst

@@ -161,12 +161,12 @@ Bifrost can be configured to use ``dynamic-login`` with the
 The updated configuration is applied with ``kayobe seed service deploy``.
 
 Overcloud Ironic can be configured with the
-``kolla_ironic_pxe_append_params_extra`` variable:
+``kolla_ironic_kernel_append_params_extra`` variable:
 
 .. code-block:: yaml
    :caption: ``ironic.yml``
 
-   kolla_ironic_pxe_append_params_extra:
+   kolla_ironic_kernel_append_params_extra:
      - sshkey="ssh-rsa BBA1..."
 
 The updated configuration is applied with ``kayobe overcloud service deploy``.

etc/kayobe/ironic.yml

@@ -109,6 +109,14 @@
 # List of kernel parameters to append for baremetal PXE boot.
 #kolla_ironic_pxe_append_params:
 
+# List of default kernel parameters to append for baremetal boot.
+#kolla_ironic_kernel_append_params_default:
+
+# List of additional kernel parameters to append for baremetal boot.
+#kolla_ironic_kernel_append_params_extra:
+
+# List of kernel parameters to append for baremetal boot.
+#kolla_ironic_kernel_append_params:
 ###############################################################################
 # Ironic Node Configuration
 

playbooks/kayobe-overcloud-base/overrides.yml.j2

@@ -52,7 +52,7 @@ compute_libvirt_enable_tls: true
 kolla_enable_tls_external: "yes"
 kolla_enable_tls_internal: "yes"
 
-kolla_ironic_pxe_append_params_extra:
+kolla_ironic_kernel_append_params_extra:
   - ipa-insecure=1
 {% endif %}
 

releasenotes/notes/add-redfish-pxe-args-for-virtual-media-1446188235feaaac.yaml

@@ -0,0 +1,12 @@
+---
+features:
+  - |
+    Adds support for Redfish virtual media and
+    PXE boot using a common set of variables.
+    Migration to using
+    ``kolla_ironic_kernel_append_params`` is
+    advised.
+    New boot variables are:
+    kolla_ironic_kernel_append_params,
+    kolla_ironic_kernel_append_params_default,
+    kolla_ironic_kernel_append_params_extra.