openstack
/
bifrost
Code Issues Proposed changes

Merge "Support extra PXE kernel arguments for Inspector"

This commit is contained in:
Jenkins 2017-05-01 07:06:28 +00:00 committed by Gerrit Code Review
parent ce8fd34da7 e3ff784da1
commit ea8bc5fd88
4 changed files with 20 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
playbooks/roles/bifrost-ironic-install/README.md
View File

@ -210,6 +210,10 @@ inspector_default_node_driver: The default driver to utilize when adding
setting for their install environment if
an alternative default driver is required.
inspector_extra_kernel_options: String value, default undefined. Extra
kernel parameters for the inspector default
PXE configuration.
### Virtual Environment Install
Bifrost can install ironic into a python virtual environment using the

4
playbooks/roles/bifrost-ironic-install/defaults/main.yml
View File

@ -141,6 +141,10 @@ inspector_port_addition: "pxe"
# Note: inspector_keep_ports has three valid values: all, present, added
inspector_keep_ports: "present"
# String value containing extra kernel parameters for the inspector default
# PXE configuration.
#inspector_extra_kernel_options:
# Inspector defaults
inspector:
discovery:

2
playbooks/roles/bifrost-ironic-install/templates/inspector-default-boot-ipxe.j2
View File

@ -5,6 +5,6 @@ dhcp || reboot
goto introspect
:introspect
kernel {{ ipa_kernel_url }} ipa-inspection-callback-url=http://{{ hostvars[inventory_hostname]['ansible_' + ans_network_interface ]['ipv4']['address'] }}:5050/v1/continue systemd.journald.forward_to_console=yes ip=${ip}:${next-server}:${gateway}:${netmask} BOOTIF=${mac} nofb nomodeset vga=normal console=ttyS0
kernel {{ ipa_kernel_url }} ipa-inspection-callback-url=http://{{ hostvars[inventory_hostname]['ansible_' + ans_network_interface ]['ipv4']['address'] }}:5050/v1/continue systemd.journald.forward_to_console=yes ip=${ip}:${next-server}:${gateway}:${netmask} BOOTIF=${mac} nofb nomodeset vga=normal console=ttyS0 {{ inspector_extra_kernel_options | default('') }}
initrd {{ ipa_ramdisk_url }}
boot

11
releasenotes/notes/inspector-pxe-args-c65acb610507ab08.yaml Normal file
View File

@ -0,0 +1,11 @@
---
features:
- |
Allows additional kernel arguments to be specified in inspector PXE config.
A number of optional features in the Ironic Python Agent (IPA) are
configured via kernel command line arguments, e.g. ``ipa-collect-lldp``.
It is now possible to specify additional kernel arguments for use by the
IPA ramdisk during inspection with the ``inspector_extra_kernel_options``
variable.