aboutsummaryrefslogtreecommitdiffstats
path: root/manifests/profile/base/ironic/conductor.pp
diff options
context:
space:
mode:
authorDmitry Tantsur <divius.inside@gmail.com>2017-04-04 11:26:13 +0200
committerDmitry Tantsur <divius.inside@gmail.com>2017-04-07 11:16:47 +0200
commitac5445fb7f5499fd5b3d317c56f606c7286132a9 (patch)
treea3838975e2e667fab15e2e51d8c0f3ed97f21f1c /manifests/profile/base/ironic/conductor.pp
parent32620c52c8d82c30158df4f63a37ace9f6ade890 (diff)
Stop including ironic::drivers::ssh in the ironic-conductor profile
The SSH drivers are deprecated, pxe_ipmitool + virtualbmc should be used instead. This is a follow-up to blueprint switch-to-virtualbmc. Change-Id: I4fd567dffa3992042eebcf495334b8130e1bdc9f
Diffstat (limited to 'manifests/profile/base/ironic/conductor.pp')
-rw-r--r--manifests/profile/base/ironic/conductor.pp5
1 files changed, 4 insertions, 1 deletions
diff --git a/manifests/profile/base/ironic/conductor.pp b/manifests/profile/base/ironic/conductor.pp
index 7f90da9..650bf1e 100644
--- a/manifests/profile/base/ironic/conductor.pp
+++ b/manifests/profile/base/ironic/conductor.pp
@@ -43,7 +43,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