From: Dmitry Tantsur <divius.inside@gmail.com>
Date: Sun, 4 Sep 2016 15:44:06 +0000 (+0200)
Subject: Ironic: update included drivers
X-Git-Tag: opnfv-6.0.0~597^2
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=7a683f7c618198642975bee0d02c5f2f9364efa6;p=apex-puppet-tripleo.git

Ironic: update included drivers

Configure drac, ilo and ssh drivers out of box.
Remove deprecated ironic::drivers::deploy.

This change brings the default driver list closer to one of undercloud.

Change-Id: I8b9a136a0ff22916d7c468bbb0df7248bc35a5c2
Partially-Implements: blueprint ironic-integration
---

diff --git a/manifests/profile/base/ironic/conductor.pp b/manifests/profile/base/ironic/conductor.pp
index d8a6e7d..4824648 100644
--- a/manifests/profile/base/ironic/conductor.pp
+++ b/manifests/profile/base/ironic/conductor.pp
@@ -33,12 +33,16 @@ class tripleo::profile::base::ironic::conductor (
   include ::tripleo::profile::base::ironic
 
   if $step >= 4 {
-      include ::ironic::drivers::deploy
-      include ::ironic::drivers::ipmi
-      include ::ironic::drivers::pxe
       include ::ironic::conductor
+      include ::ironic::drivers::pxe
       if $manage_pxe {
           include ::ironic::pxe
       }
+
+      # Configure a few popular drivers
+      include ::ironic::drivers::drac
+      include ::ironic::drivers::ilo
+      include ::ironic::drivers::ipmi
+      include ::ironic::drivers::ssh
   }
 }