openstack
/
puppet-tripleo
Code Issues Proposed changes

Remove Dell EMC PS Series Driver support 

... because it it not supported in anymore, and puppet-cinder
implementation was already removed in [1]

[1] 7083e88a699233930b0de413394ae95cab649462

Depends-on: https://review.opendev.org/#/c/716027/
Change-Id: I8b7af40a4dfba297821a7aae6edf5938c43034a1
This commit is contained in:
Takashi Kajinami 2020-04-03 08:17:43 +09:00
parent 0bef823532
commit d706806959
5 changed files with 2 additions and 149 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -50,10 +50,6 @@
# (Optional) Whether to enable the hpelefthand backend
# Defaults to false
#
# [*cinder_enable_dellps_backend*]
# (Optional) Whether to enable the dellps backend
# Defaults to false
#
# [*cinder_enable_iscsi_backend*]
# (Optional) Whether to enable the iscsi backend
# Defaults to true
@ -124,7 +120,6 @@ class tripleo::profile::base::cinder::volume (
$cinder_enable_dellemc_vnx_backend = false,
$cinder_enable_dellemc_xtremio_iscsi_backend = false,
$cinder_enable_hpelefthand_backend = false,
$cinder_enable_dellps_backend = false,
$cinder_enable_iscsi_backend = true,
$cinder_enable_netapp_backend = false,
$cinder_enable_nfs_backend = false,
@ -231,13 +226,6 @@ class tripleo::profile::base::cinder::volume (
$cinder_hpelefthand_backend_name = undef
}
if $cinder_enable_dellps_backend {
include tripleo::profile::base::cinder::volume::dellps
$cinder_dellps_backend_name = hiera('cinder::backend::dellps::volume_backend_name', 'tripleo_dellps')
} else {
$cinder_dellps_backend_name = undef
}
if $cinder_enable_iscsi_backend {
include tripleo::profile::base::cinder::volume::iscsi
$cinder_iscsi_backend_name = hiera('cinder::backend::iscsi::volume_backend_name', 'tripleo_iscsi')
@ -311,7 +299,6 @@ class tripleo::profile::base::cinder::volume (
$cinder_rbd_backend_name,
$cinder_rbd_extra_backend_names,
$cinder_pure_backend_name,
$cinder_dellps_backend_name,
$cinder_dellsc_backend_name,
$cinder_dellemc_unity_backend_name,
$cinder_dellemc_powermax_backend_name,

52
manifests/profile/base/cinder/volume/dellps.pp
View File

@ -1,52 +0,0 @@
# Copyright 2016 Red Hat, Inc.
#
# 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.
#
# == Class: tripleo::profile::base::cinder::volume::dellps
#
# Cinder Volume for dellps profile tripleo
#
# === Parameters
#
# [*backend_name*]
# (Optional) Name given to the Cinder backend stanza
# Defaults to 'tripleo_dellps'
#
# [*step*]
# (Optional) The current step in deployment. See tripleo-heat-templates
# for more details.
# Defaults to hiera('step')
#
class tripleo::profile::base::cinder::volume::dellps (
$backend_name = hiera('cinder::backend::eqlx::volume_backend_name', 'tripleo_dellps'),
$step = Integer(hiera('step')),
) {
include tripleo::profile::base::cinder::volume
if $step >= 4 {
cinder::backend::eqlx { $backend_name :
backend_availability_zone => hiera('cinder::backend::eqlx::backend_availability_zone', undef),
san_ip => hiera('cinder::backend::eqlx::san_ip', undef),
san_login => hiera('cinder::backend::eqlx::san_login', undef),
san_password => hiera('cinder::backend::eqlx::san_password', undef),
san_private_key => hiera('cinder::backend::eqlx::san_private_key', undef),
san_thin_provision => hiera('cinder::backend::eqlx::san_thin_provision', undef),
eqlx_group_name => hiera('cinder::backend::eqlx::eqlx_group_name', undef),
eqlx_pool => hiera('cinder::backend::eqlx::eqlx_pool', undef),
use_chap_auth => hiera('cinder::backend::eqlx::eqlx_use_chap', undef),
chap_username => hiera('cinder::backend::eqlx::eqlx_chap_login', undef),
chap_password => hiera('cinder::backend::eqlx::eqlx_chap_password', undef),
}
}
}

58
spec/classes/tripleo_profile_base_cinder_volume_dellps_spec.rb
View File

@ -1,58 +0,0 @@
#
# Copyright (C) 2016 Red Hat, Inc.
#
# 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.
#
require 'spec_helper'
describe 'tripleo::profile::base::cinder::volume::dellps' do
shared_examples_for 'tripleo::profile::base::cinder::volume::dellps' do
before :each do
facts.merge!({ :step => params[:step] })
end
context 'with step less than 4' do
let(:params) { { :step => 3 } }
it 'should do nothing' do
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')
is_expected.to_not contain_cinder__backend__eqlx('tripleo_dellps')
end
end
context 'with step 4' do
let(:params) { {
:step => 4,
} }
it 'should trigger complete configuration' do
# TODO(aschultz): check hiera parameters
is_expected.to contain_cinder__backend__eqlx('tripleo_dellps')
end
end
end
on_supported_os.each do |os, facts|
context "on #{os}" do
let(:facts) do
facts.merge({ :hostname => 'node.example.com' })
end
it_behaves_like 'tripleo::profile::base::cinder::volume::dellps'
end
end
end

26
spec/classes/tripleo_profile_base_cinder_volume_spec.rb
View File

@ -139,25 +139,6 @@ describe 'tripleo::profile::base::cinder::volume' do
end
end
context 'with only dellps' do
before :each do
params.merge!({
:cinder_enable_dellps_backend => true,
:cinder_enable_iscsi_backend => false,
})
end
it 'should configure only dellps' do
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 contain_class('tripleo::profile::base::cinder::volume')
is_expected.to contain_class('tripleo::profile::base::cinder')
is_expected.to contain_class('cinder::volume')
is_expected.to contain_class('cinder::backends').with(
:enabled_backends => ['tripleo_dellps']
)
end
end
context 'with only netapp' do
before :each do
params.merge!({
@ -260,7 +241,6 @@ describe 'tripleo::profile::base::cinder::volume' do
is_expected.to_not contain_class('tripleo::profile::base::cinder::volume::iscsi')
is_expected.to_not contain_class('tripleo::profile::base::cinder::volume::pure')
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::netapp')
is_expected.to_not contain_class('tripleo::profile::base::cinder::volume::veritas_hyperscale')
is_expected.to_not contain_class('tripleo::profile::base::cinder::volume::nfs')
@ -282,7 +262,6 @@ describe 'tripleo::profile::base::cinder::volume' do
:cinder_enable_iscsi_backend => true,
:cinder_enable_pure_backend => true,
:cinder_enable_dellsc_backend => true,
:cinder_enable_dellps_backend => true,
:cinder_enable_netapp_backend => true,
:cinder_enable_vrts_hs_backend => true,
})
@ -291,7 +270,6 @@ describe 'tripleo::profile::base::cinder::volume' do
is_expected.to contain_class('tripleo::profile::base::cinder::volume::iscsi')
is_expected.to contain_class('tripleo::profile::base::cinder::volume::pure')
is_expected.to contain_class('tripleo::profile::base::cinder::volume::dellsc')
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::veritas_hyperscale')
is_expected.to contain_class('tripleo::profile::base::cinder::volume::nfs')
@ -300,8 +278,8 @@ describe 'tripleo::profile::base::cinder::volume' do
is_expected.to contain_class('tripleo::profile::base::cinder')
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_netapp','tripleo_nfs','Veritas_HyperScale']
:enabled_backends => ['tripleo_iscsi', 'tripleo_ceph', 'tripleo_pure', 'tripleo_dellsc',
'tripleo_netapp','tripleo_nfs','Veritas_HyperScale']
)
end
end

2
spec/fixtures/hieradata/step4.yaml vendored
View File

@ -8,8 +8,6 @@ tripleo::profile::base::cinder::volume::iscsi::cinder_iscsi_address: '127.0.0.1'
tripleo::profile::base::cinder::volume::nfs::cinder_nfs_servers:
- '127.0.0.1'
cinder::backend::dellsc_iscsi::iscsi_ip_address: '127.0.0.1'
cinder::backend::eqlx::eqlx_chap_login: 'user'
cinder::backend::eqlx::eqlx_chap_password: 'user'
cinder::backend::emc_vnx::storage_vnx_pool_names: 'emc-storage-pool'
service_names:
- 'ceilometer_agent_central'