diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2017-04-27 16:01:43 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2017-04-27 16:01:43 +0000 |
| commit | 09de6b033035a29259480771d12964b7ff175da1 (patch) | |
| tree | 41ff691cd918fd5798065038834ae36cec77dc49 /puppet | |
| parent | c9d758ce6addc2576af057d50eaf5a79f56285a7 (diff) | |
| parent | 625db6e42c6fd33907d8f0164c3ef2c2b609d399 (diff) | |
Merge "[ironic] expose default boot_option in configuration and change it to local"
Diffstat (limited to 'puppet')
| -rw-r--r-- | puppet/services/ironic-conductor.yaml | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/puppet/services/ironic-conductor.yaml b/puppet/services/ironic-conductor.yaml index 666967b9..83e2b850 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. @@ -95,6 +102,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} ironic::conductor::enabled_hardware_types: {get_param: IronicEnabledHardwareTypes} # We need an endpoint containing a real IP, not a VIP here |