From 8b4bdb353309109f93966f11aae08c2f57c1410d Mon Sep 17 00:00:00 2001 From: Dmitry Tantsur Date: Tue, 1 Nov 2016 15:41:47 +0100 Subject: [PATCH] Prevent pxe_ilo driver from guessing the boot mode to use The iLO drivers try to set boot mode to UEFI when they detect UEFI-capable hardware. This can be surprising for operators, as it's not consistent with other drivers. Also, UEFI support in TripleO is somewhat less mature. Change the default boot mode to "bios" via puppet. Operators can still change the boot mode per node by setting an appropriate capability. Change-Id: Ide26d05289ba962759163a60dab06e5152812dba Closes-Bug: #1604002 (cherry picked from commit f3fd1e384e90db5f23a9bec7836633f122f03cc2) --- elements/puppet-stack-config/puppet-stack-config.pp | 1 + elements/puppet-stack-config/puppet-stack-config.yaml.template | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/elements/puppet-stack-config/puppet-stack-config.pp b/elements/puppet-stack-config/puppet-stack-config.pp index f5ff56ca4..387e61886 100644 --- a/elements/puppet-stack-config/puppet-stack-config.pp +++ b/elements/puppet-stack-config/puppet-stack-config.pp @@ -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 diff --git a/elements/puppet-stack-config/puppet-stack-config.yaml.template b/elements/puppet-stack-config/puppet-stack-config.yaml.template index 236330219..7f32fcbd1 100644 --- a/elements/puppet-stack-config/puppet-stack-config.yaml.template +++ b/elements/puppet-stack-config/puppet-stack-config.yaml.template @@ -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}}