openstack/puppet-ironic
Code Issues Proposed changes

Merge "Add deps to all that is needed"

Browse Source
This commit is contained in:
Jenkins 2017-03-15 20:49:54 +00:00 committed by Gerrit Code Review
commit a78fd6cae9
5 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
manifests/drivers/drac.pp
View File

@ -23,6 +23,8 @@ class ironic::drivers::drac (
$package_ensure = 'present',
) {
include ::ironic::deps
ensure_packages('python-dracclient',
{
ensure => $package_ensure,

3
manifests/drivers/hardware_interface.pp
View File

@ -34,6 +34,9 @@ define ironic::drivers::hardware_interface (
$enabled_list = $::os_service_default,
$default = $::os_service_default,
) {
include ::ironic::deps
if !is_service_default($enabled_list) and !empty($enabled_list){
validate_array($enabled_list)
$enabled_list_real = join($enabled_list, ',')

19
manifests/drivers/ilo.pp
View File

@ -38,21 +38,22 @@
# (optional) The state of the proliantutils package
# Defaults to 'present'
#
class ironic::drivers::ilo (
$client_timeout = $::os_service_default,
$client_port = $::os_service_default,
$use_web_server_for_images = $::os_service_default,
$default_boot_mode = $::os_service_default,
$package_ensure = 'present',
$client_timeout = $::os_service_default,
$client_port = $::os_service_default,
$use_web_server_for_images = $::os_service_default,
$default_boot_mode = $::os_service_default,
$package_ensure = 'present',
) {
include ::ironic::deps
# Configure ironic.conf
ironic_config {
'ilo/client_timeout': value => $client_timeout;
'ilo/client_port': value => $client_port;
'ilo/client_timeout': value => $client_timeout;
'ilo/client_port': value => $client_port;
'ilo/use_web_server_for_images': value => $use_web_server_for_images;
'ilo/default_boot_mode': value => $default_boot_mode;
'ilo/default_boot_mode': value => $default_boot_mode;
}
ensure_packages('python-proliantutils',

1
manifests/drivers/ipmi.pp
View File

@ -24,7 +24,6 @@
# Should be an interger value
# Defaults to '10'.
#
class ironic::drivers::ipmi (
$retry_timeout = '10'
) {

1
manifests/drivers/ssh.pp
View File

@ -21,7 +21,6 @@
# (optional) libvirt URI.
# Defaults to $::os_service_default.
#
class ironic::drivers::ssh (
$libvirt_uri = $::os_service_default,
) {