Revert "PowerMax driver - rebranding VMAX to PowerMax"
The patch was not backward compatible. We should properly
deprecate the old parameters to not break our users.
This reverts commit 0c831bbed8.
Change-Id: Ib37c75952fed7c762a71dae3cd169b7753faf6f7
This commit is contained in:
Emilien Macchi
parent
7d23aef317
commit
6d0b3a95e2
@ -1,7 +1,7 @@
|
||||
#
|
||||
# == Define: cinder::backend::dellemc_powermax_iscsi
|
||||
# == Define: cinder::backend::dellemc_vmax_iscsi
|
||||
#
|
||||
# Setup Cinder to use the Dell EMC PowerMax ISCSI Driver
|
||||
# Setup Cinder to use the Dell EMC VMAX ISCSI Driver
|
||||
# Compatible for multiple backends
|
||||
#
|
||||
# == Parameters
|
||||
@ -17,11 +17,11 @@
|
||||
# Defaults to $::os_service_default.
|
||||
#
|
||||
# [*cinder_emc_config_file*]
|
||||
# (required) File path of Dell EMC PowerMax ISCSI specific configuration file.
|
||||
# (required) File path of Dell EMC VMAX ISCSI specific configuration file.
|
||||
#
|
||||
# [*volume_driver*]
|
||||
# (optional) The Dell EMC PowerMax ISCSI Driver
|
||||
# Defaults to cinder.volume.drivers.dell_emc.powermax.iscsi.PowerMaxISCSIDriver
|
||||
# (optional) The Dell EMC VMAX ISCSI Driver
|
||||
# Defaults to cinder.volume.drivers.dell_emc.vmax.iscsi.VMAXISCSIDriver
|
||||
#
|
||||
# [*manage_volume_type*]
|
||||
# (Optional) Whether or not manage Cinder Volume type.
|
||||
@ -33,14 +33,14 @@
|
||||
# (optional) Hash of extra options to pass to the backend stanza
|
||||
# Defaults to: {}
|
||||
# Example :
|
||||
# { 'dellemc_powermax_iscsi_backend/param1' => { 'value' => value1 } }#
|
||||
# { 'dellemc_vmax_iscsi_backend/param1' => { 'value' => value1 } }#
|
||||
#
|
||||
define cinder::backend::dellemc_powermax_iscsi (
|
||||
define cinder::backend::dellemc_vmax_iscsi (
|
||||
$cinder_emc_config_file,
|
||||
$volume_backend_name = $name,
|
||||
$backend_availability_zone = $::os_service_default,
|
||||
$extra_options = {},
|
||||
$volume_driver = 'cinder.volume.drivers.dell_emc.powermax.iscsi.PowerMaxISCSIDriver',
|
||||
$volume_driver = 'cinder.volume.drivers.dell_emc.vmax.iscsi.VMAXISCSIDriver',
|
||||
$manage_volume_type = false,
|
||||
) {
|
||||
|
||||
@ -1,5 +0,0 @@
|
||||
---
|
||||
upgrade:
|
||||
- |
|
||||
PowerMax driver - 'PowerMax' is to replace 'VMAX' in release notes,
|
||||
online documentation, directory structure and driver name.
|
||||
@ -1,65 +0,0 @@
|
||||
require 'spec_helper'
|
||||
|
||||
describe 'cinder::backend::dellemc_powermax_iscsi' do
|
||||
let (:title) { 'dellemc_powermax_iscsi' }
|
||||
|
||||
let :req_params do
|
||||
{
|
||||
:cinder_emc_config_file => '/etc/cinder/cinder_emc_config_CONF_GROUP_ISCSI.xml',
|
||||
:volume_backend_name => 'dellemc_powermax_iscsi',
|
||||
}
|
||||
end
|
||||
|
||||
let :params do
|
||||
req_params
|
||||
end
|
||||
|
||||
shared_examples 'cinder::backend::dellemc_powermax_iscsi' do
|
||||
context 'dell emc powermax iscsi volume driver' do
|
||||
it {
|
||||
should contain_package('pywbem').with(:ensure => :present)
|
||||
should contain_cinder_config('dellemc_powermax_iscsi/volume_driver').with_value('cinder.volume.drivers.dell_emc.powermax.iscsi.PowerMaxISCSIDriver')
|
||||
should contain_cinder_config('dellemc_powermax_iscsi/cinder_emc_config_file').with_value('/etc/cinder/cinder_emc_config_CONF_GROUP_ISCSI.xml')
|
||||
}
|
||||
end
|
||||
|
||||
context 'dell emc powermax iscsi backend overriding some parameters' do
|
||||
before :each do
|
||||
params.merge!({
|
||||
:backend_availability_zone => 'my_zone',
|
||||
:manage_volume_type => true,
|
||||
})
|
||||
end
|
||||
|
||||
it {
|
||||
should contain_cinder_config('dellemc_powermax_iscsi/cinder_emc_config_file').with_value('/etc/cinder/cinder_emc_config_CONF_GROUP_ISCSI.xml')
|
||||
should contain_cinder_config('dellemc_powermax_iscsi/backend_availability_zone').with_value('my_zone')
|
||||
}
|
||||
|
||||
it { should contain_cinder_type('dellemc_powermax_iscsi').with(
|
||||
:ensure => 'present',
|
||||
:properties => ['volume_backend_name=dellemc_powermax_iscsi']
|
||||
)}
|
||||
end
|
||||
|
||||
context 'dell emc powermax iscsi backend with additional configuration' do
|
||||
before :each do
|
||||
params.merge!( :extra_options => {'dellemc_powermax_iscsi/param1' => {'value' => 'value1'}} )
|
||||
end
|
||||
|
||||
it { should contain_cinder_config('dellemc_powermax_iscsi/param1').with_value('value1') }
|
||||
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 'cinder::backend::dellemc_powermax_iscsi'
|
||||
end
|
||||
end
|
||||
end
|
||||
65
spec/defines/cinder_backend_dellemc_vmax_spec.rb
Normal file
65
spec/defines/cinder_backend_dellemc_vmax_spec.rb
Normal file
@ -0,0 +1,65 @@
|
||||
require 'spec_helper'
|
||||
|
||||
describe 'cinder::backend::dellemc_vmax_iscsi' do
|
||||
let (:title) { 'dellemc_vmax_iscsi' }
|
||||
|
||||
let :req_params do
|
||||
{
|
||||
:cinder_emc_config_file => '/etc/cinder/cinder_emc_config_CONF_GROUP_ISCSI.xml',
|
||||
:volume_backend_name => 'dellemc_vmax_iscsi',
|
||||
}
|
||||
end
|
||||
|
||||
let :params do
|
||||
req_params
|
||||
end
|
||||
|
||||
shared_examples 'cinder::backend::dellemc_vmax_iscsi' do
|
||||
context 'dell emc vmax iscsi volume driver' do
|
||||
it {
|
||||
should contain_package('pywbem').with(:ensure => :present)
|
||||
should contain_cinder_config('dellemc_vmax_iscsi/volume_driver').with_value('cinder.volume.drivers.dell_emc.vmax.iscsi.VMAXISCSIDriver')
|
||||
should contain_cinder_config('dellemc_vmax_iscsi/cinder_emc_config_file').with_value('/etc/cinder/cinder_emc_config_CONF_GROUP_ISCSI.xml')
|
||||
}
|
||||
end
|
||||
|
||||
context 'dell emc vmax iscsi backend overriding some parameters' do
|
||||
before :each do
|
||||
params.merge!({
|
||||
:backend_availability_zone => 'my_zone',
|
||||
:manage_volume_type => true,
|
||||
})
|
||||
end
|
||||
|
||||
it {
|
||||
should contain_cinder_config('dellemc_vmax_iscsi/cinder_emc_config_file').with_value('/etc/cinder/cinder_emc_config_CONF_GROUP_ISCSI.xml')
|
||||
should contain_cinder_config('dellemc_vmax_iscsi/backend_availability_zone').with_value('my_zone')
|
||||
}
|
||||
|
||||
it { should contain_cinder_type('dellemc_vmax_iscsi').with(
|
||||
:ensure => 'present',
|
||||
:properties => ['volume_backend_name=dellemc_vmax_iscsi']
|
||||
)}
|
||||
end
|
||||
|
||||
context 'dell emc vmax iscsi backend with additional configuration' do
|
||||
before :each do
|
||||
params.merge!( :extra_options => {'dellemc_vmax_iscsi/param1' => {'value' => 'value1'}} )
|
||||
end
|
||||
|
||||
it { should contain_cinder_config('dellemc_vmax_iscsi/param1').with_value('value1') }
|
||||
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 'cinder::backend::dellemc_vmax_iscsi'
|
||||
end
|
||||
end
|
||||
end
|
||||
Loading…
Reference in New Issue
Block a user