diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2017-05-20 00:20:29 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2017-05-20 00:20:29 +0000 |
| commit | cdbc8e8d1dbe63d194f6e3cfab2ae215d37513a0 (patch) | |
| tree | 5939fb02c3a160c3f7610b7fee6470fbae154a5e /puppet/services | |
| parent | cbd528f4115468cd17109c89c3a7ca7b21262848 (diff) | |
| parent | 2c727c40ea6efa703ad8f2fcfbed5f9daaa25439 (diff) | |
Merge "Support Redfish hardware in the overcloud Ironic"
Diffstat (limited to 'puppet/services')
| -rw-r--r-- | puppet/services/ironic-conductor.yaml | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/puppet/services/ironic-conductor.yaml b/puppet/services/ironic-conductor.yaml index 76b1bf3d..b1676715 100644 --- a/puppet/services/ironic-conductor.yaml +++ b/puppet/services/ironic-conductor.yaml @@ -61,9 +61,19 @@ parameters: description: Enabled Ironic drivers type: comma_delimited_list IronicEnabledHardwareTypes: - default: ['ipmi'] + default: ['ipmi', 'redfish'] description: Enabled Ironic hardware types type: comma_delimited_list + IronicEnabledManagementInterfaces: + default: ['ipmitool', 'redfish'] + description: Enabled management interface implementations. Each hardware + type must have at least one valid implementation enabled. + type: comma_delimited_list + IronicEnabledPowerInterfaces: + default: ['ipmitool', 'redfish'] + description: Enabled power interface implementations. Each hardware + type must have at least one valid implementation enabled. + type: comma_delimited_list IronicIPXEEnabled: default: true description: Whether to use iPXE instead of PXE for deployment. @@ -136,7 +146,9 @@ outputs: 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_management_interfaces: {get_param: IronicEnabledManagementInterfaces} ironic::drivers::interfaces::enabled_network_interfaces: ['flat', 'neutron'] + ironic::drivers::interfaces::enabled_power_interfaces: {get_param: IronicEnabledPowerInterfaces} ironic::drivers::interfaces::default_network_interface: {get_param: IronicDefaultNetworkInterface} tripleo.ironic_conductor.firewall_rules: '134 ironic conductor TFTP': |