diff options
author | Jenkins <jenkins@review.openstack.org> | 2017-04-07 18:45:18 +0000 |
---|---|---|
committer | Gerrit Code Review <review@openstack.org> | 2017-04-07 18:45:18 +0000 |
commit | cad6c62feec19323f995617b68d0ac50aec373b8 (patch) | |
tree | 1baeddb806b4bba255e8958e9e9a607bb77254ff | |
parent | 02a50caf4e456a229a3aadf4b0ca2faaf46beedf (diff) | |
parent | ac5445fb7f5499fd5b3d317c56f606c7286132a9 (diff) |
Merge "Stop including ironic::drivers::ssh in the ironic-conductor profile"
-rw-r--r-- | manifests/profile/base/ironic/conductor.pp | 5 | ||||
-rw-r--r-- | releasenotes/notes/ironic-ssh-removal-e5f40b477cf7357c.yaml | 5 |
2 files changed, 9 insertions, 1 deletions
diff --git a/manifests/profile/base/ironic/conductor.pp b/manifests/profile/base/ironic/conductor.pp index cb0524b..941c0bd 100644 --- a/manifests/profile/base/ironic/conductor.pp +++ b/manifests/profile/base/ironic/conductor.pp @@ -44,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 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. |