openstack/puppet-ironic
Code Issues Proposed changes

Merge "[inspector] allow sending random kernel arguments to the IPA"

Browse Source
This commit is contained in:
Jenkins 2016-02-17 13:36:54 +00:00 committed by Gerrit Code Review
commit 7c450d5f1c
4 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
manifests/inspector.pp
View File

@ -138,6 +138,10 @@
# Comma-separated list of processing hooks to append to the default list.
# Defaults to undef
#
# [*ramdisk_kernel_args*]
# String with kernel arguments to send to the ramdisk on boot.
# Defaults to undef
#
class ironic::inspector (
$package_ensure = 'present',
$enabled = true,
@ -169,6 +173,7 @@ class ironic::inspector (
$sync_db = true,
$ramdisk_collectors = 'default',
$additional_processing_hooks = undef,
$ramdisk_kernel_args = undef,
) {
include ::ironic::params

3
spec/classes/ironic_inspector_spec.rb
View File

@ -143,6 +143,7 @@ describe 'ironic::inspector' do
:swift_auth_url => 'http://192.168.0.1:5000/v2.0',
:pxe_transfer_protocol => 'http',
:additional_processing_hooks => 'hook1,hook2',
:ramdisk_kernel_args => 'foo=bar',
)
end
it 'should replace default parameter with new value' do
@ -171,7 +172,7 @@ describe 'ironic::inspector' do
'content' => /ipxe/,
)
is_expected.to contain_file('/httpboot/inspector.ipxe').with_content(
/kernel http:\/\/192.168.0.1:8088\/agent.kernel ipa-inspection-callback-url=http:\/\/192.168.0.1:5050\/v1\/continue ipa-inspection-collectors=default/
/kernel http:\/\/192.168.0.1:8088\/agent.kernel ipa-inspection-callback-url=http:\/\/192.168.0.1:5050\/v1\/continue ipa-inspection-collectors=default.* foo=bar/
)
end
end

2
templates/inspector_ipxe.erb
View File

@ -2,6 +2,6 @@
dhcp
kernel http://<%= @dnsmasq_local_ip %>:8088/agent.kernel ipa-inspection-callback-url=http://<%= @dnsmasq_local_ip %>:5050/v1/continue ipa-inspection-collectors=<%= @ramdisk_collectors %> systemd.journald.forward_to_console=yes BOOTIF=${mac}
kernel http://<%= @dnsmasq_local_ip %>:8088/agent.kernel ipa-inspection-callback-url=http://<%= @dnsmasq_local_ip %>:5050/v1/continue ipa-inspection-collectors=<%= @ramdisk_collectors %> systemd.journald.forward_to_console=yes BOOTIF=${mac} <%= @ramdisk_kernel_args %>
initrd http://<%= @dnsmasq_local_ip %>:8088/agent.ramdisk
boot

2
templates/inspector_pxelinux_cfg.erb
View File

@ -2,5 +2,5 @@ default inspector
label inspector
kernel agent.kernel
append initrd=agent.ramdisk ipa-inspection-callback-url=http://<%= @dnsmasq_local_ip %>:5050/v1/continue ipa-inspection-collectors=<%= @ramdisk_collectors %> systemd.journald.forward_to_console=yes
append initrd=agent.ramdisk ipa-inspection-callback-url=http://<%= @dnsmasq_local_ip %>:5050/v1/continue ipa-inspection-collectors=<%= @ramdisk_collectors %> systemd.journald.forward_to_console=yes <%= @ramdisk_kernel_args %>
ipappend 3