openstack
/
puppet-ironic
Code Issues Proposed changes

Expose enabled_drivers 

Allow enabled_drivers to be modified for configurations where additional
drivers besides just the default pxe_ipmitool need to be used.

Change-Id: I6390f39bb583f44c23506006f0496b9ebb18205d
This commit is contained in:
James Slagle 2015-02-13 21:07:35 -05:00
parent 6733465482
commit 7311ab0ed6
2 changed files with 17 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
manifests/init.pp
View File

@ -41,6 +41,10 @@
# (optional) Default protocol to use when connecting to glance
# Defaults to 'keystone'. 'https' is the only other valid option for SSL
#
# [*enabled_drivers*]
# (optional) List of drivers to load during service initialization.
# Defaults to 'pxe_ipmitool'.
#
# [*control_exchange*]
# (optional) What RPC queue/exchange to use
# Defaults to openstack
@ -121,6 +125,7 @@ class ironic (
$verbose = false,
$debug = false,
$auth_strategy = 'keystone',
$enabled_drivers = 'pxe_ipmitool',
$control_exchange = 'openstack',
$rpc_backend = 'ironic.openstack.common.rpc.impl_kombu',
$rabbit_password = false,
@ -289,4 +294,11 @@ class ironic (
}
}
if $enabled_drivers {
ironic_config {
'DEFAULT/enabled_drivers': value => $enabled_drivers;
}
}
}

5
spec/classes/ironic_init_spec.rb
View File

@ -26,6 +26,7 @@ describe 'ironic' do
{ :package_ensure => 'present',
:verbose => false,
:debug => false,
:enabled_drivers => 'pxe_ipmitool',
:rabbit_host => '127.0.0.1',
:rabbit_port => 5672,
:rabbit_hosts => false,
@ -122,6 +123,10 @@ describe 'ironic' do
)
end
it 'configures enabled_drivers' do
should contain_ironic_config('DEFAULT/enabled_drivers').with_value( params[:enabled_drivers] )
end
it 'configures credentials for rabbit' do
should contain_ironic_config('DEFAULT/rabbit_userid').with_value( params[:rabbit_user] )
should contain_ironic_config('DEFAULT/rabbit_password').with_value( params[:rabbit_password] )