openstack
/
instack-undercloud
Code Issues Proposed changes

Merge "Handling defaults for pxe_bootfile_name and pxe_config_template moved to puppet"

This commit is contained in:
Jenkins 2016-08-30 11:33:24 +00:00 committed by Gerrit Code Review
parent 4b8e941102 541523bee8
commit ef84a6d9e1
2 changed files with 4 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
elements/puppet-stack-config/puppet-stack-config.pp
View File

@ -416,27 +416,10 @@ include ::ironic::api
include ::ironic::conductor
include ::ironic::drivers::deploy
include ::ironic::drivers::ipmi
include ::ironic::drivers::pxe
include ::ironic::drivers::ssh
include ::ironic::inspector
if str2bool(hiera('ipxe_deploy', true)) {
$pxe_config_template = '$pybasedir/drivers/modules/ipxe_config.template'
$pxe_bootfile_name = 'undionly.kpxe'
$uefi_pxe_config_template = '$pybasedir/drivers/modules/ipxe_config.template'
$uefi_pxe_bootfile_name = 'ipxe.efi'
} else {
$pxe_config_template = '$pybasedir/drivers/modules/pxe_config.template'
$pxe_bootfile_name = undef
$uefi_pxe_config_template = undef
$uefi_pxe_bootfile_name = undef
}
class { '::ironic::drivers::pxe':
pxe_config_template => $pxe_config_template,
pxe_bootfile_name => $pxe_bootfile_name,
uefi_pxe_bootfile_name => $uefi_pxe_bootfile_name,
uefi_pxe_config_template => $uefi_pxe_config_template,
}
if str2bool(hiera('enable_tempest', true)) {
# tempest
# TODO: when puppet-tempest supports install by package, do that instead

3
elements/puppet-stack-config/puppet-stack-config.yaml.template
View File

@ -450,6 +450,9 @@ ironic::inspector::http_port: "%{hiera('ironic::drivers::deploy::http_port')}"
# Ironic pxe
ironic::drivers::pxe::ipxe_enabled: {{IPXE_DEPLOY}}
# NOTE(dtantsur): UEFI only works with iPXE currently for us
ironic::drivers::pxe::uefi_pxe_config_template: '$pybasedir/drivers/modules/ipxe_config.template'
ironic::drivers::pxe::uefi_pxe_bootfile_name: 'ipxe.efi'
# Ironic ipmi
ironic::drivers::ipmi::retry_timeout: 15