openstack/puppet-ironic
Code Issues Proposed changes

Remove support for already removed SSH drivers

Browse Source 
Change-Id: I4d8d0b139ac9da70409be0c9c36822cbb9b52c26
This commit is contained in:
Dmitry Tantsur 2017-09-19 14:17:20 +02:00
parent 100f4341d9
commit 98cda9d193
3 changed files with 5 additions and 90 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
manifests/drivers/ssh.pp
View File

@ -1,40 +0,0 @@
# Copyright 2016 Red Hat, Inc.
# All Rights Reserved.
#
# Licensed under the Apache License, Version 2.0 (the "License"); you may
# not use this file except in compliance with the License. You may obtain
# a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
# License for the specific language governing permissions and limitations
# under the License.
# Configure the SSH driver in Ironic
#
# === Parameters
#
# [*libvirt_uri*]
# (optional) libvirt URI.
# Defaults to $::os_service_default.
#
class ironic::drivers::ssh (
$libvirt_uri = $::os_service_default,
) {
include ::ironic::deps
warning("The *_ssh family of drivers was deprecated in Ironic in the Newton \
release, and will be removed in Pike. The ironic::drivers::ssh module will \
become noop then, and will be removed in Queens. Please switch to using \
*_ipmitool family of drivers with virtualbmc for virtual testing.")
# Configure ironic.conf
ironic_config {
'ssh/libvirt_uri': value => $libvirt_uri;
}
}

5
releasenotes/notes/ssh-removal-07d9adf11526e322.yaml Normal file
View File

@ -0,0 +1,5 @@
---
upgrade:
- |
Removed support for setting options related to the SSH drivers. These
drivers were removed from Ironic in the Pike release.

50
spec/classes/ironic_drivers_ssh_spec.rb
View File

@ -1,50 +0,0 @@
# Copyright 2016 Red Hat, Inc.
# All Rights Reserved.
#
# Licensed under the Apache License, Version 2.0 (the "License"); you may
# not use this file except in compliance with the License. You may obtain
# a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
# License for the specific language governing permissions and limitations
# under the License.
#
# Unit tests for ironic::drivers::ipmi class
#
require 'spec_helper'
describe 'ironic::drivers::ssh' do
shared_examples_for 'ironic driver ssh' do
context 'with default parameters' do
it { is_expected.to contain_ironic_config('ssh/libvirt_uri').with_value('<SERVICE DEFAULT>') }
end
context 'when overriding parameters' do
let :params do
{ :libvirt_uri => 'qemu:///session' }
end
it { is_expected.to contain_ironic_config('ssh/libvirt_uri').with_value('qemu:///session') }
end
end
on_supported_os({
:supported_os => OSDefaults.get_supported_os
}).each do |os,facts|
context "on #{os}" do
let (:facts) do
facts.merge!(OSDefaults.get_facts())
end
it_behaves_like 'ironic driver ssh'
end
end
end