openstack/instack-undercloud
Code Issues Proposed changes

Merge "Prevent pxe_ilo driver from guessing the boot mode to use" into stable/newton

Browse Source
This commit is contained in:
Jenkins
2016-11-16 16:25:55 +00:00
committed by Gerrit Code Review
parent a5ab73f1d6 8b4bdb3533
commit 632c6433c4
2 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -424,6 +424,7 @@ include ::nova::network::neutron
include ::ironic
include ::ironic::api
include ::ironic::conductor
include ::ironic::drivers::ilo
include ::ironic::drivers::ipmi
include ::ironic::drivers::pxe
include ::ironic::drivers::ssh

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

@@ -448,8 +448,9 @@ ironic::drivers::agent::deploy_logs_collect: 'always'
ironic::drivers::agent::deploy_logs_storage_backend: 'local'
ironic::drivers::agent::deploy_logs_local_path: '/var/log/ironic/deploy/'
# Ironic ipmi
# Ironic power and management drivers tuning
ironic::drivers::ipmi::retry_timeout: 15
ironic::drivers::ilo::default_boot_mode: 'bios'
# Rabbit
rabbit_cookie: {{UNDERCLOUD_RABBIT_COOKIE}}