summaryrefslogtreecommitdiffstats
path: root/manifests/profile/base/ironic
diff options
context:
space:
mode:
Diffstat (limited to 'manifests/profile/base/ironic')
-rw-r--r--manifests/profile/base/ironic/conductor.pp6
1 files changed, 5 insertions, 1 deletions
diff --git a/manifests/profile/base/ironic/conductor.pp b/manifests/profile/base/ironic/conductor.pp
index 7f90da9..941c0bd 100644
--- a/manifests/profile/base/ironic/conductor.pp
+++ b/manifests/profile/base/ironic/conductor.pp
@@ -34,6 +34,7 @@ class tripleo::profile::base::ironic::conductor (
if $step >= 4 {
include ::ironic::conductor
+ include ::ironic::drivers::interfaces
include ::ironic::drivers::pxe
if $manage_pxe {
include ::ironic::pxe
@@ -43,7 +44,10 @@ class tripleo::profile::base::ironic::conductor (
include ::ironic::drivers::drac
include ::ironic::drivers::ilo
include ::ironic::drivers::ipmi
- include ::ironic::drivers::ssh
+ # TODO: deprecated code cleanup, remove in Queens
+ ironic_config {
+ 'ssh/libvirt_uri': ensure => absent;
+ }
# Configure access to other services
include ::ironic::drivers::inspector