Merge "Support for PowerFlex Cinder Backend"
This commit is contained in:
commit
228e3bb19c
|
@ -34,6 +34,10 @@
|
|||
# (Optional) Whether to enable the unity backend
|
||||
# Defaults to false
|
||||
#
|
||||
# [*cinder_enable_dellemc_powerflex_backend*]
|
||||
# (Optional) Whether to enable the powerflex backend
|
||||
# Defaults to false
|
||||
#
|
||||
# [*cinder_enable_dellemc_powermax_backend*]
|
||||
# (Optional) Whether to enable the powermax backend
|
||||
# Defaults to false
|
||||
|
@ -136,6 +140,7 @@ class tripleo::profile::base::cinder::volume (
|
|||
$cinder_enable_dellsc_backend = false,
|
||||
$cinder_enable_dellemc_sc_backend = false,
|
||||
$cinder_enable_dellemc_unity_backend = false,
|
||||
$cinder_enable_dellemc_powerflex_backend = false,
|
||||
$cinder_enable_dellemc_powermax_backend = false,
|
||||
$cinder_enable_dellemc_powerstore_backend = false,
|
||||
$cinder_enable_dellemc_vmax_iscsi_backend = false,
|
||||
|
@ -224,6 +229,13 @@ class tripleo::profile::base::cinder::volume (
|
|||
$cinder_dellemc_unity_backend_name = undef
|
||||
}
|
||||
|
||||
if $cinder_enable_dellemc_powerflex_backend {
|
||||
include tripleo::profile::base::cinder::volume::dellemc_powerflex
|
||||
$cinder_dellemc_powerflex_backend_name = hiera('cinder::backend::dellemc_powerflex::volume_backend_name', 'tripleo_dellemc_powerflex')
|
||||
} else {
|
||||
$cinder_dellemc_powerflex_backend_name = undef
|
||||
}
|
||||
|
||||
if $cinder_enable_dellemc_powermax_backend {
|
||||
include tripleo::profile::base::cinder::volume::dellemc_powermax
|
||||
$cinder_dellemc_powermax_backend_name = hiera('cinder::backend::dellemc_powermax::volume_backend_name', 'tripleo_dellemc_powermax')
|
||||
|
@ -362,6 +374,7 @@ class tripleo::profile::base::cinder::volume (
|
|||
$cinder_dellsc_backend_name,
|
||||
$cinder_dellemc_sc_backend_name,
|
||||
$cinder_dellemc_unity_backend_name,
|
||||
$cinder_dellemc_powerflex_backend_name,
|
||||
$cinder_dellemc_powermax_backend_name,
|
||||
$cinder_dellemc_powerstore_backend_name,
|
||||
$cinder_dellemc_vmax_iscsi_backend_name,
|
||||
|
|
|
@ -0,0 +1,58 @@
|
|||
# Copyright (c) 2020 Dell Inc, or its subsidiaries.
|
||||
#
|
||||
# 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::dellemc_powerflex
|
||||
#
|
||||
# Cinder Volume dellemc_powerflex profile for tripleo
|
||||
#
|
||||
# === Parameters
|
||||
#
|
||||
# [*backend_name*]
|
||||
# (Optional) Name given to the Cinder backend stanza
|
||||
# Defaults to 'tripleo_dellemc_powerflex'
|
||||
#
|
||||
# [*step*]
|
||||
# (Optional) The current step in deployment. See tripleo-heat-templates
|
||||
# for more details.
|
||||
# Defaults to hiera('step')
|
||||
#
|
||||
class tripleo::profile::base::cinder::volume::dellemc_powerflex (
|
||||
$backend_name = hiera('cinder::backend::dellemc_powerflex::volume_backend_name', 'tripleo_dellemc_powerflex'),
|
||||
$step = Integer(hiera('step')),
|
||||
) {
|
||||
include tripleo::profile::base::cinder::volume
|
||||
|
||||
if $step >= 4 {
|
||||
cinder::backend::dellemc_powerflex { $backend_name :
|
||||
backend_availability_zone => hiera('cinder::backend::dellemc_powerflex::backend_availability_zone', undef),
|
||||
san_login => hiera('cinder::backend::dellemc_powerflex::san_login', undef),
|
||||
san_password => hiera('cinder::backend::dellemc_powerflex::san_password', undef),
|
||||
san_ip => hiera('cinder::backend::dellemc_powerflex::san_ip', undef),
|
||||
powerflex_storage_pools => hiera('cinder::backend::dellemc_powerflex::powerflex_storage_pools', undef),
|
||||
powerflex_allow_migration_during_rebuild => hiera('cinder::backend::dellemc_powerflex::powerflex_allow_migration_during_rebuild',
|
||||
undef),
|
||||
powerflex_allow_non_padded_volumes => hiera('cinder::backend::dellemc_powerflex::powerflex_allow_non_padded_volumes', undef),
|
||||
powerflex_max_over_subscription_ratio => hiera('cinder::backend::dellemc_powerflex::powerflex_max_over_subscription_ratio',
|
||||
undef),
|
||||
powerflex_rest_server_port => hiera('cinder::backend::dellemc_powerflex::powerflex_rest_server_port', undef),
|
||||
powerflex_round_volume_capacity => hiera('cinder::backend::dellemc_powerflex::powerflex_round_volume_capacity', undef),
|
||||
powerflex_server_api_version => hiera('cinder::backend::dellemc_powerflex::powerflex_server_api_version', undef),
|
||||
powerflex_unmap_volume_before_deletion => hiera('cinder::backend::dellemc_powerflex::powerflex_unmap_volume_before_deletion',
|
||||
undef),
|
||||
san_thin_provision => hiera('cinder::backend::dellemc_powerflex::san_thin_provision', undef),
|
||||
driver_ssl_cert_verify => hiera('cinder::backend::dellemc_powerflex::driver_ssl_cert_verify', undef),
|
||||
driver_ssl_cert_path => hiera('cinder::backend::dellemc_powerflex::driver_ssl_cert_path', undef)
|
||||
}
|
||||
}
|
||||
}
|
|
@ -0,0 +1,3 @@
|
|||
---
|
||||
features:
|
||||
- Add PowerFlex Cinder driver support.
|
|
@ -0,0 +1,58 @@
|
|||
#
|
||||
# Copyright (c) 2020 Dell Inc, or its subsidiaries
|
||||
#
|
||||
# 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::dellemc_powerflex' do
|
||||
shared_examples_for 'tripleo::profile::base::cinder::volume::dellemc_powerflex' 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::dellemc_powerflex')
|
||||
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__dellemc_powerflex('tripleo_dellemc_powerflex')
|
||||
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__dellemc_powerflex('tripleo_dellemc_powerflex')
|
||||
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::dellemc_powerflex'
|
||||
end
|
||||
end
|
||||
end
|
|
@ -224,6 +224,25 @@ describe 'tripleo::profile::base::cinder::volume' do
|
|||
end
|
||||
end
|
||||
|
||||
context 'with only powerflex' do
|
||||
before :each do
|
||||
params.merge!({
|
||||
:cinder_enable_dellemc_powerflex_backend => true,
|
||||
:cinder_enable_iscsi_backend => false,
|
||||
})
|
||||
end
|
||||
it 'should configure only powerflex' do
|
||||
is_expected.to contain_class('tripleo::profile::base::cinder::volume::dellemc_powerflex')
|
||||
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_dellemc_powerflex']
|
||||
)
|
||||
end
|
||||
end
|
||||
|
||||
context 'with only vxflexos' do
|
||||
before :each do
|
||||
params.merge!({
|
||||
|
@ -347,6 +366,7 @@ describe 'tripleo::profile::base::cinder::volume' do
|
|||
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_xtremio')
|
||||
is_expected.to_not contain_class('tripleo::profile::base::cinder::volume::dellsc')
|
||||
is_expected.to_not contain_class('tripleo::profile::base::cinder::volume::dellemc_powerflex')
|
||||
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_powerstore')
|
||||
is_expected.to_not contain_class('tripleo::profile::base::cinder::volume::dellemc_vxflexos')
|
||||
|
@ -370,6 +390,7 @@ describe 'tripleo::profile::base::cinder::volume' do
|
|||
:cinder_enable_rbd_backend => true,
|
||||
:cinder_enable_iscsi_backend => true,
|
||||
:cinder_enable_pure_backend => true,
|
||||
:cinder_enable_dellemc_powerflex_backend => true,
|
||||
:cinder_enable_dellemc_powermax_backend => true,
|
||||
:cinder_enable_dellemc_powerstore_backend => true,
|
||||
:cinder_enable_dellemc_sc_backend => true,
|
||||
|
@ -386,6 +407,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_xtremio')
|
||||
is_expected.to contain_class('tripleo::profile::base::cinder::volume::dellsc')
|
||||
is_expected.to contain_class('tripleo::profile::base::cinder::volume::dellemc_powerflex')
|
||||
is_expected.to contain_class('tripleo::profile::base::cinder::volume::dellemc_powermax')
|
||||
is_expected.to contain_class('tripleo::profile::base::cinder::volume::dellemc_powerstore')
|
||||
is_expected.to contain_class('tripleo::profile::base::cinder::volume::dellemc_vxflexos')
|
||||
|
@ -397,8 +419,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_dellsc', 'tripleo_dellemc_sc','tripleo_dellemc_powermax',
|
||||
'tripleo_dellemc_powerstore','tripleo_dellemc_vxflexos', 'tripleo_dellemc_xtremio',
|
||||
:enabled_backends => ['tripleo_iscsi', 'tripleo_ceph', 'tripleo_pure', 'tripleo_dellsc', 'tripleo_dellemc_sc','tripleo_dellemc_powerflex',
|
||||
'tripleo_dellemc_powermax', 'tripleo_dellemc_powerstore','tripleo_dellemc_vxflexos', 'tripleo_dellemc_xtremio',
|
||||
'tripleo_netapp','tripleo_nfs','Veritas_HyperScale']
|
||||
)
|
||||
end
|
||||
|
|
Loading…
Reference in New Issue