aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2016-09-05 15:15:50 +0000
committerGerrit Code Review <review@openstack.org>2016-09-05 15:15:50 +0000
commit8b0e161f7592bf33d09ba85d9a32fa6682948a2c (patch)
tree5b398692f1a468f1b604d20a338e3827cc006a09
parente0702c336eb1775b22e75bea807629f4da71918f (diff)
parent7a683f7c618198642975bee0d02c5f2f9364efa6 (diff)
Merge "Ironic: update included drivers"
-rw-r--r--manifests/profile/base/ironic/conductor.pp10
1 files changed, 7 insertions, 3 deletions
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
}
}