From 0064ff2d98db5d87f60d2e5e63d8b9bcf3a5d37e Mon Sep 17 00:00:00 2001
From: Dmitry Tantsur <divius.inside@gmail.com>
Date: Fri, 24 Nov 2017 13:41:50 +0100
Subject: [PATCH] Add support for oVirt via the staging-ovirt hardware type

Depends-On: Ibef8f33f306b9d3b598698345ce3b0978f62a2ad
Depends-On: Iebf31db70dfd800d47399c69d7b2255467a87a1d
Change-Id: I3e5d0a72e2ba22537ce2c0eb30000c29f429dc3f
Implements: blueprint ovirt-driver
---
 elements/puppet-stack-config/puppet-stack-config.pp   | 1 +
 instack_undercloud/undercloud.py                      | 2 +-
 releasenotes/notes/ovirt-driver-caa85e9a99ba1aef.yaml | 6 ++++++
 3 files changed, 8 insertions(+), 1 deletion(-)
 create mode 100644 releasenotes/notes/ovirt-driver-caa85e9a99ba1aef.yaml

diff --git a/elements/puppet-stack-config/puppet-stack-config.pp b/elements/puppet-stack-config/puppet-stack-config.pp
index 944d5c752..be7143090 100644
--- a/elements/puppet-stack-config/puppet-stack-config.pp
+++ b/elements/puppet-stack-config/puppet-stack-config.pp
@@ -511,6 +511,7 @@ include ::ironic::drivers::interfaces
 include ::ironic::drivers::ipmi
 include ::ironic::drivers::pxe
 include ::ironic::drivers::redfish
+include ::ironic::drivers::staging
 include ::ironic::glance
 include ::ironic::inspector
 include ::ironic::inspector::cors
diff --git a/instack_undercloud/undercloud.py b/instack_undercloud/undercloud.py
index 5acc310f1..5c427b785 100644
--- a/instack_undercloud/undercloud.py
+++ b/instack_undercloud/undercloud.py
@@ -1128,7 +1128,7 @@ def _process_drivers_and_hardware_types(instack_env):
     # use one variable for them.
     mgmt_interfaces = {'fake', 'ipmitool'}
     # TODO(dtantsur): can we somehow avoid hardcoding hardware types here?
-    for hw_type in ('redfish', 'idrac', 'ilo', 'irmc'):
+    for hw_type in ('redfish', 'idrac', 'ilo', 'irmc', 'staging-ovirt'):
         if hw_type in enabled_hardware_types:
             mgmt_interfaces.add(hw_type)
     for (hw_type, iface) in [('cisco-ucs-managed', 'ucsm'),
diff --git a/releasenotes/notes/ovirt-driver-caa85e9a99ba1aef.yaml b/releasenotes/notes/ovirt-driver-caa85e9a99ba1aef.yaml
new file mode 100644
index 000000000..8cbcd66db
--- /dev/null
+++ b/releasenotes/notes/ovirt-driver-caa85e9a99ba1aef.yaml
@@ -0,0 +1,6 @@
+---
+features:
+  - |
+    Adds support for using oVirt with Ironic via the new ``staging-ovirt``
+    hardware type. The hardware type is not enabled by default and requires
+    installing the ``ovirt-engine-sdk-python`` package.