From 625db6e42c6fd33907d8f0164c3ef2c2b609d399 Mon Sep 17 00:00:00 2001 From: Dmitry Tantsur Date: Fri, 17 Mar 2017 12:28:27 +0100 Subject: [ironic] expose default boot_option in configuration and change it to local Ironic is going to change the default boot_option from netboot to local in the near future. Let's be pro-active, and change it in advance. Users cano change it back via new IronicDefaultBootOption configuration. Partial-Bug: #1619339 Change-Id: Idddc2e384c6cd9a1595777090500bf04f230edd4 --- puppet/services/ironic-conductor.yaml | 8 ++++++++ releasenotes/notes/ironic-boot-option-3f3036aa5e82ec7e.yaml | 12 ++++++++++++ 2 files changed, 20 insertions(+) create mode 100644 releasenotes/notes/ironic-boot-option-3f3036aa5e82ec7e.yaml diff --git a/puppet/services/ironic-conductor.yaml b/puppet/services/ironic-conductor.yaml index be910d10..8f2c0602 100644 --- a/puppet/services/ironic-conductor.yaml +++ b/puppet/services/ironic-conductor.yaml @@ -32,6 +32,13 @@ parameters: created yet) and should be changed to an actual UUID in a post-deployment stack update. type: string + IronicDefaultBootOption: + default: 'local' + description: How to boot the bare metal instances. Set to 'local' (the + default) to use local bootloader (requires grub2 for partition + images). Set to 'netboot' to make the instances boot from + controllers using PXE/iPXE. + type: string IronicDefaultNetworkInterface: default: 'flat' description: Network interface implementation to use by default. @@ -91,6 +98,7 @@ outputs: ironic::conductor::cleaning_disk_erase: {get_param: IronicCleaningDiskErase} ironic::conductor::cleaning_network: {get_param: IronicCleaningNetwork} ironic::conductor::provisioning_network: {get_param: IronicProvisioningNetwork} + ironic::conductor::default_boot_option: {get_param: IronicDefaultBootOption} ironic::conductor::enabled_drivers: {get_param: IronicEnabledDrivers} # We need an endpoint containing a real IP, not a VIP here ironic_conductor_http_host: {get_param: [ServiceNetMap, IronicNetwork]} diff --git a/releasenotes/notes/ironic-boot-option-3f3036aa5e82ec7e.yaml b/releasenotes/notes/ironic-boot-option-3f3036aa5e82ec7e.yaml new file mode 100644 index 00000000..53191bd0 --- /dev/null +++ b/releasenotes/notes/ironic-boot-option-3f3036aa5e82ec7e.yaml @@ -0,0 +1,12 @@ +--- +features: + - | + New configuration ``IronicDefaultBootOption`` allows to change the default + boot option to use for bare metal instances in the overcloud. +upgrade: + - | + The default boot option for bare metal instances in overcloud was changed + to "local". This was already the default for whole-disk images, but for + partition images it requires ``grub2`` to be installed on them. + Use the new ``IronicDefaultBootOption`` configuration to override, or + set ``boot_option`` capability on nodes and flavors. -- cgit 1.2.3-korg