From: Dmitry Tantsur <divius.inside@gmail.com>
Date: Tue, 4 Apr 2017 09:26:13 +0000 (+0200)
Subject: Stop including ironic::drivers::ssh in the ironic-conductor profile
X-Git-Tag: opnfv-6.0.0~247^2
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=ac5445fb7f5499fd5b3d317c56f606c7286132a9;p=apex-puppet-tripleo.git

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
---

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
diff --git a/releasenotes/notes/ironic-ssh-removal-e5f40b477cf7357c.yaml b/releasenotes/notes/ironic-ssh-removal-e5f40b477cf7357c.yaml
new file mode 100644
index 0000000..206ed12
--- /dev/null
+++ b/releasenotes/notes/ironic-ssh-removal-e5f40b477cf7357c.yaml
@@ -0,0 +1,5 @@
+---
+upgrade:
+  - |
+    Out-of-box support for Ironic ``*_ssh`` drivers was removed. These drivers
+    were deprecated in the Newton release.