Browse Source

Merge "Powermax Config Fixes" into stable/train

changes/20/737720/1
Zuul 3 weeks ago
committed by Gerrit Code Review
parent
commit
8a4e5fd61e
3 changed files with 10 additions and 7 deletions
  1. +2
    -2
      manifests/profile/base/cinder/volume/dellemc_powermax.pp
  2. +4
    -4
      spec/classes/tripleo_profile_base_cinder_powermax_spec.rb
  3. +4
    -1
      spec/classes/tripleo_profile_base_cinder_volume_spec.rb

+ 2
- 2
manifests/profile/base/cinder/volume/dellemc_powermax.pp View File

@@ -33,7 +33,7 @@
# Defaults to hiera('step')
#
class tripleo::profile::base::cinder::volume::dellemc_powermax (
$backend_name = hiera('cinder::backend::dellemc_powermax::volume_backend_name', ['tripleo_dellemc_powermx']),
$backend_name = hiera('cinder::backend::dellemc_powermax::volume_backend_name', ['tripleo_dellemc_powermax']),
$multi_config = hiera('cinder::backend::dellemc_powermax::volume_multi_config', {}),
$step = Integer(hiera('step')),
) {
@@ -51,7 +51,7 @@ class tripleo::profile::base::cinder::volume::dellemc_powermax (
'CinderPowermaxPortGroups' => hiera('cinder::backend::dellemc_powermax::powermax_port_groups', undef),
}

$backend_name.each |String $backend| {
any2array($backend_name).each |String $backend| {
$backend_config = merge($backend_defaults, pick($multi_config[$backend], {}))

cinder::backend::dellemc_powermax { $backend :


+ 4
- 4
spec/classes/tripleo_profile_base_cinder_powermax_spec.rb View File

@@ -40,9 +40,8 @@ describe 'tripleo::profile::base::cinder::volume::dellemc_powermax' do
it 'should trigger complete configuration' do
is_expected.to contain_cinder__backend__dellemc_powermax('tripleo_dellemc_powermax')
end
end

context 'with multiple backends' do
context 'with multiple backends' do
let(:params) { {
:backend_name => ['tripleo_dellemc_powermax_1', 'tripleo_dellemc_powermax_2'],
:multi_config => { 'tripleo_dellemc_powermax_2' => { 'CinderPowermaxStorageProtocol' => 'FC' }},
@@ -57,7 +56,9 @@ describe 'tripleo::profile::base::cinder::volume::dellemc_powermax' do
is_expected.to contain_cinder_config('tripleo_dellemc_powermax_2/volume_driver')
.with_value('cinder.volume.drivers.dell_emc.powermax.fc.PowerMaxFCDriver')
end
end
end
end
end

on_supported_os.each do |os, facts|
context "on #{os}" do
@@ -69,4 +70,3 @@ describe 'tripleo::profile::base::cinder::volume::dellemc_powermax' do
end
end
end
end

+ 4
- 1
spec/classes/tripleo_profile_base_cinder_volume_spec.rb View File

@@ -337,6 +337,7 @@ describe 'tripleo::profile::base::cinder::volume' do
is_expected.to_not contain_class('tripleo::profile::base::cinder::volume::dellsc')
is_expected.to_not contain_class('tripleo::profile::base::cinder::volume::dellps')
is_expected.to_not contain_class('tripleo::profile::base::cinder::volume::dellemc_sc')
is_expected.to_not contain_class('tripleo::profile::base::cinder::volume::dellemc_powermax')
is_expected.to_not contain_class('tripleo::profile::base::cinder::volume::dellemc_vxflexos')
is_expected.to_not contain_class('tripleo::profile::base::cinder::volume::dellemc_xtremio')
is_expected.to_not contain_class('tripleo::profile::base::cinder::volume::netapp')
@@ -362,6 +363,7 @@ describe 'tripleo::profile::base::cinder::volume' do
:cinder_enable_dellps_backend => true,
:cinder_enable_dellsc_backend => true,
:cinder_enable_dellemc_sc_backend => true,
:cinder_enable_dellemc_powermax_backend => true,
:cinder_enable_dellemc_vxflexos_backend => true,
:cinder_enable_dellemc_xtremio_backend => true,
:cinder_enable_netapp_backend => true,
@@ -376,6 +378,7 @@ describe 'tripleo::profile::base::cinder::volume' do
is_expected.to contain_class('tripleo::profile::base::cinder::volume::dellemc_sc')
is_expected.to contain_class('tripleo::profile::base::cinder::volume::dellemc_vxflexos')
is_expected.to contain_class('tripleo::profile::base::cinder::volume::dellemc_xtremio')
is_expected.to contain_class('tripleo::profile::base::cinder::volume::dellemc_powermax')
is_expected.to contain_class('tripleo::profile::base::cinder::volume::netapp')
is_expected.to contain_class('tripleo::profile::base::cinder::volume::veritas_hyperscale')
is_expected.to contain_class('tripleo::profile::base::cinder::volume::nfs')
@@ -385,7 +388,7 @@ describe 'tripleo::profile::base::cinder::volume' do
is_expected.to contain_class('cinder::volume')
is_expected.to contain_class('cinder::backends').with(
:enabled_backends => ['tripleo_iscsi', 'tripleo_ceph', 'tripleo_pure', 'tripleo_dellps', 'tripleo_dellsc',
'tripleo_dellemc_sc', 'tripleo_dellemc_vxflexos', 'tripleo_dellemc_xtremio', 'tripleo_netapp',
'tripleo_dellemc_sc', 'tripleo_dellemc_powermax', 'tripleo_dellemc_vxflexos', 'tripleo_dellemc_xtremio', 'tripleo_netapp',
'tripleo_nfs', 'Veritas_HyperScale']
)
end


Loading…
Cancel
Save