From: Jenkins <jenkins@review.openstack.org>
Date: Sat, 20 May 2017 00:20:29 +0000 (+0000)
Subject: Merge "Support Redfish hardware in the overcloud Ironic"
X-Git-Tag: opnfv-6.0.0~645
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=cdbc8e8d1dbe63d194f6e3cfab2ae215d37513a0;hp=cbd528f4115468cd17109c89c3a7ca7b21262848;p=apex-tripleo-heat-templates.git

Merge "Support Redfish hardware in the overcloud Ironic"
---

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':
diff --git a/releasenotes/notes/redfish-9203af1f7bf02bc5.yaml b/releasenotes/notes/redfish-9203af1f7bf02bc5.yaml
new file mode 100644
index 00000000..8c24a22f
--- /dev/null
+++ b/releasenotes/notes/redfish-9203af1f7bf02bc5.yaml
@@ -0,0 +1,8 @@
+---
+features:
+  - |
+    Support for Redfish hardware is enabled by default for overcloud Ironic
+    via the ``redfish`` hardware type.
+  - |
+    Support changing enabled management and power interfaces for hardware types
+    in overcloud Ironic.