openstack/puppet-tripleo
Code Issues Proposed changes

Rebranding of Eqlx to Dell EMC PS Series

Browse Source 
This changes rebrands Dell Eqlx to Dell PS series
and matches the tripleo-heat-templates.

Change-Id: I3536147a06b426ace18cf415e99361c47b4cf5d9
This commit is contained in:
rajinir
2017-02-07 10:02:54 -06:00
parent 40f12b482d
commit 6e074bfde1
4 changed files with 28 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
manifests/profile/base/cinder/volume.pp
View File

@@ -26,8 +26,8 @@
# (Optional) Whether to enable the hpelefthand backend # (Optional) Whether to enable the hpelefthand backend
# Defaults to false # Defaults to false
# #
# [*cinder_enable_eqlx_backend*] # [*cinder_enable_dellps_backend*]
# (Optional) Whether to enable the eqlx backend # (Optional) Whether to enable the dellps backend
# Defaults to true # Defaults to true
# #
# [*cinder_enable_iscsi_backend*] # [*cinder_enable_iscsi_backend*]
@@ -58,7 +58,7 @@
class tripleo::profile::base::cinder::volume ( class tripleo::profile::base::cinder::volume (
$cinder_enable_dellsc_backend = false, $cinder_enable_dellsc_backend = false,
$cinder_enable_hpelefthand_backend = false, $cinder_enable_hpelefthand_backend = false,
$cinder_enable_eqlx_backend = false, $cinder_enable_dellps_backend = false,
$cinder_enable_iscsi_backend = true, $cinder_enable_iscsi_backend = true,
$cinder_enable_netapp_backend = false, $cinder_enable_netapp_backend = false,
$cinder_enable_nfs_backend = false, $cinder_enable_nfs_backend = false,
@@ -85,11 +85,11 @@ class tripleo::profile::base::cinder::volume (
$cinder_hpelefthand_backend_name = undef $cinder_hpelefthand_backend_name = undef
} }
if $cinder_enable_eqlx_backend { if $cinder_enable_dellps_backend {
include ::tripleo::profile::base::cinder::volume::eqlx include ::tripleo::profile::base::cinder::volume::dellps
$cinder_eqlx_backend_name = hiera('cinder::backend::eqlx::volume_backend_name', 'tripleo_eqlx') $cinder_dellps_backend_name = hiera('cinder::backend::dellps::volume_backend_name', 'tripleo_dellps')
} else { } else {
$cinder_eqlx_backend_name = undef $cinder_dellps_backend_name = undef
} }
if $cinder_enable_iscsi_backend { if $cinder_enable_iscsi_backend {
@@ -122,7 +122,7 @@ class tripleo::profile::base::cinder::volume (
$backends = delete_undef_values([$cinder_iscsi_backend_name, $backends = delete_undef_values([$cinder_iscsi_backend_name,
$cinder_rbd_backend_name, $cinder_rbd_backend_name,
$cinder_eqlx_backend_name, $cinder_dellps_backend_name,
$cinder_dellsc_backend_name, $cinder_dellsc_backend_name,
$cinder_hpelefthand_backend_name, $cinder_hpelefthand_backend_name,
$cinder_netapp_backend_name, $cinder_netapp_backend_name,

10
manifests/profile/base/cinder/volume/eqlx.pp → manifests/profile/base/cinder/volume/dellps.pp
View File

@@ -12,23 +12,23 @@
# License for the specific language governing permissions and limitations # License for the specific language governing permissions and limitations
# under the License. # under the License.
# #
# == Class: tripleo::profile::base::cinder::volume::eqlx # == Class: tripleo::profile::base::cinder::volume::dellps
# #
# Cinder Volume eqlx profile for tripleo # Cinder Volume for dellps profile tripleo
# #
# === Parameters # === Parameters
# #
# [*backend_name*] # [*backend_name*]
# (Optional) Name given to the Cinder backend stanza # (Optional) Name given to the Cinder backend stanza
# Defaults to 'tripleo_eqlx' # Defaults to 'tripleo_dellps'
# #
# [*step*] # [*step*]
# (Optional) The current step in deployment. See tripleo-heat-templates # (Optional) The current step in deployment. See tripleo-heat-templates
# for more details. # for more details.
# Defaults to hiera('step') # Defaults to hiera('step')
# #
class tripleo::profile::base::cinder::volume::eqlx ( class tripleo::profile::base::cinder::volume::dellps (
$backend_name = hiera('cinder::backend::eqlx::volume_backend_name', 'tripleo_eqlx'), $backend_name = hiera('cinder::backend::eqlx::volume_backend_name', 'tripleo_dellps'),
$step = hiera('step'), $step = hiera('step'),
) { ) {
include ::tripleo::profile::base::cinder::volume include ::tripleo::profile::base::cinder::volume

12
spec/classes/tripleo_profile_base_cinder_volume_eqlx_spec.rb → spec/classes/tripleo_profile_base_cinder_volume_dellps_spec.rb
View File

@@ -16,8 +16,8 @@
require 'spec_helper' require 'spec_helper'
describe 'tripleo::profile::base::cinder::volume::eqlx' do describe 'tripleo::profile::base::cinder::volume::dellps' do
shared_examples_for 'tripleo::profile::base::cinder::volume::eqlx' do shared_examples_for 'tripleo::profile::base::cinder::volume::dellps' do
before :each do before :each do
facts.merge!({ :step => params[:step] }) facts.merge!({ :step => params[:step] })
end end
@@ -26,10 +26,10 @@ describe 'tripleo::profile::base::cinder::volume::eqlx' do
let(:params) { { :step => 3 } } let(:params) { { :step => 3 } }
it 'should do nothing' do it 'should do nothing' do
is_expected.to contain_class('tripleo::profile::base::cinder::volume::eqlx') is_expected.to contain_class('tripleo::profile::base::cinder::volume::dellps')
is_expected.to contain_class('tripleo::profile::base::cinder::volume') is_expected.to contain_class('tripleo::profile::base::cinder::volume')
is_expected.to contain_class('tripleo::profile::base::cinder') is_expected.to contain_class('tripleo::profile::base::cinder')
is_expected.to_not contain_cinder__backend__eqlx('tripleo_eqlx') is_expected.to_not contain_cinder__backend__eqlx('tripleo_dellps')
end end
end end
@@ -40,7 +40,7 @@ describe 'tripleo::profile::base::cinder::volume::eqlx' do
it 'should trigger complete configuration' do it 'should trigger complete configuration' do
# TODO(aschultz): check hiera parameters # TODO(aschultz): check hiera parameters
is_expected.to contain_cinder__backend__eqlx('tripleo_eqlx') is_expected.to contain_cinder__backend__eqlx('tripleo_dellps')
end end
end end
end end
@@ -52,7 +52,7 @@ describe 'tripleo::profile::base::cinder::volume::eqlx' do
facts.merge({ :hostname => 'node.example.com' }) facts.merge({ :hostname => 'node.example.com' })
end end
it_behaves_like 'tripleo::profile::base::cinder::volume::eqlx' it_behaves_like 'tripleo::profile::base::cinder::volume::dellps'
end end
end end
end end

18
spec/classes/tripleo_profile_base_cinder_volume_spec.rb
View File

@@ -74,21 +74,21 @@ describe 'tripleo::profile::base::cinder::volume' do
end end
end end
context 'with only eqlx' do context 'with only dellps' do
before :each do before :each do
params.merge!({ params.merge!({
:cinder_enable_eqlx_backend => true, :cinder_enable_dellps_backend => true,
:cinder_enable_iscsi_backend => false, :cinder_enable_iscsi_backend => false,
}) })
end end
it 'should configure only eqlx' do it 'should configure only dellps' do
is_expected.to contain_class('tripleo::profile::base::cinder::volume::eqlx') is_expected.to contain_class('tripleo::profile::base::cinder::volume::dellps')
is_expected.to_not contain_class('tripleo::profile::base::cinder::volume::iscsi') is_expected.to_not contain_class('tripleo::profile::base::cinder::volume::iscsi')
is_expected.to contain_class('tripleo::profile::base::cinder::volume') is_expected.to contain_class('tripleo::profile::base::cinder::volume')
is_expected.to contain_class('tripleo::profile::base::cinder') is_expected.to contain_class('tripleo::profile::base::cinder')
is_expected.to contain_class('cinder::volume') is_expected.to contain_class('cinder::volume')
is_expected.to contain_class('cinder::backends').with( is_expected.to contain_class('cinder::backends').with(
:enabled_backends => ['tripleo_eqlx'] :enabled_backends => ['tripleo_dellps']
) )
end end
end end
@@ -160,7 +160,7 @@ describe 'tripleo::profile::base::cinder::volume' do
it 'should configure only user backend' do it 'should configure only user backend' do
is_expected.to_not contain_class('tripleo::profile::base::cinder::volume::iscsi') is_expected.to_not contain_class('tripleo::profile::base::cinder::volume::iscsi')
is_expected.to_not contain_class('tripleo::profile::base::cinder::volume::dellsc') is_expected.to_not contain_class('tripleo::profile::base::cinder::volume::dellsc')
is_expected.to_not contain_class('tripleo::profile::base::cinder::volume::eqlx') is_expected.to_not contain_class('tripleo::profile::base::cinder::volume::dellps')
is_expected.to_not contain_class('tripleo::profile::base::cinder::volume::netapp') is_expected.to_not contain_class('tripleo::profile::base::cinder::volume::netapp')
is_expected.to_not contain_class('tripleo::profile::base::cinder::volume::nfs') is_expected.to_not contain_class('tripleo::profile::base::cinder::volume::nfs')
is_expected.to_not contain_class('tripleo::profile::base::cinder::volume::rbd') is_expected.to_not contain_class('tripleo::profile::base::cinder::volume::rbd')
@@ -178,7 +178,7 @@ describe 'tripleo::profile::base::cinder::volume' do
params.merge!({ params.merge!({
:cinder_enable_iscsi_backend => true, :cinder_enable_iscsi_backend => true,
:cinder_enable_dellsc_backend => true, :cinder_enable_dellsc_backend => true,
:cinder_enable_eqlx_backend => true, :cinder_enable_dellps_backend => true,
:cinder_enable_netapp_backend => true, :cinder_enable_netapp_backend => true,
:cinder_enable_nfs_backend => true, :cinder_enable_nfs_backend => true,
:cinder_enable_rbd_backend => true, :cinder_enable_rbd_backend => true,
@@ -187,7 +187,7 @@ describe 'tripleo::profile::base::cinder::volume' do
it 'should configure all backends' do it 'should configure all backends' do
is_expected.to contain_class('tripleo::profile::base::cinder::volume::iscsi') is_expected.to contain_class('tripleo::profile::base::cinder::volume::iscsi')
is_expected.to contain_class('tripleo::profile::base::cinder::volume::dellsc') is_expected.to contain_class('tripleo::profile::base::cinder::volume::dellsc')
is_expected.to contain_class('tripleo::profile::base::cinder::volume::eqlx') is_expected.to contain_class('tripleo::profile::base::cinder::volume::dellps')
is_expected.to contain_class('tripleo::profile::base::cinder::volume::netapp') is_expected.to contain_class('tripleo::profile::base::cinder::volume::netapp')
is_expected.to contain_class('tripleo::profile::base::cinder::volume::nfs') is_expected.to contain_class('tripleo::profile::base::cinder::volume::nfs')
is_expected.to contain_class('tripleo::profile::base::cinder::volume::rbd') is_expected.to contain_class('tripleo::profile::base::cinder::volume::rbd')
@@ -195,7 +195,7 @@ describe 'tripleo::profile::base::cinder::volume' do
is_expected.to contain_class('tripleo::profile::base::cinder') is_expected.to contain_class('tripleo::profile::base::cinder')
is_expected.to contain_class('cinder::volume') is_expected.to contain_class('cinder::volume')
is_expected.to contain_class('cinder::backends').with( is_expected.to contain_class('cinder::backends').with(
:enabled_backends => ['tripleo_iscsi', 'tripleo_ceph', 'tripleo_eqlx', :enabled_backends => ['tripleo_iscsi', 'tripleo_ceph', 'tripleo_dellps',
'tripleo_dellsc', 'tripleo_netapp','tripleo_nfs'] 'tripleo_dellsc', 'tripleo_netapp','tripleo_nfs']
) )
end end