summaryrefslogtreecommitdiffstats
path: root/puppet/services
diff options
context:
space:
mode:
authorDmitry Tantsur <divius.inside@gmail.com>2017-04-05 12:44:47 +0200
committerDmitry Tantsur <divius.inside@gmail.com>2017-04-05 12:51:18 +0200
commit8d03b9d755303944a920081a4205d7e4457661dd (patch)
treefc29dc78e82697071a4da77e73ce5d0cc96fdda4 /puppet/services
parent6ddcd9a1cb38bb58c18a415f047eae856843afb5 (diff)
Allow configuring enabled hardware types for Ironic
This enabled ``ipmi`` hardware type with all defaults + support for socat-based nova-compatible serial console. Part of blueprint ironic-driver-composition Depends-On: Ie434609c62cf052ee169a0fac0db3200647a1af0 Change-Id: Iecead2d6581dff7a9cead58de6505567d7cd2402
Diffstat (limited to 'puppet/services')
-rw-r--r--puppet/services/ironic-conductor.yaml6
1 files changed, 6 insertions, 0 deletions
diff --git a/puppet/services/ironic-conductor.yaml b/puppet/services/ironic-conductor.yaml
index be910d10..666967b9 100644
--- a/puppet/services/ironic-conductor.yaml
+++ b/puppet/services/ironic-conductor.yaml
@@ -45,6 +45,10 @@ parameters:
default: ['pxe_ipmitool', 'pxe_drac', 'pxe_ilo']
description: Enabled Ironic drivers
type: comma_delimited_list
+ IronicEnabledHardwareTypes:
+ default: ['ipmi']
+ description: Enabled Ironic hardware types
+ type: comma_delimited_list
IronicIPXEEnabled:
default: true
description: Whether to use iPXE instead of PXE for deployment.
@@ -92,6 +96,7 @@ outputs:
ironic::conductor::cleaning_network: {get_param: IronicCleaningNetwork}
ironic::conductor::provisioning_network: {get_param: IronicProvisioningNetwork}
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
ironic_conductor_http_host: {get_param: [ServiceNetMap, IronicNetwork]}
ironic::conductor::http_url:
@@ -112,6 +117,7 @@ outputs:
# 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::drivers::interfaces::enabled_console_interfaces: ['ipmitool-socat', 'no-console']
ironic::drivers::interfaces::enabled_network_interfaces: ['flat', 'neutron']
ironic::drivers::interfaces::default_network_interface: {get_param: IronicDefaultNetworkInterface}
tripleo.ironic_conductor.firewall_rules: