Merge "Cinder: Clean up deprecated Dell EMC volume drivers"
This commit is contained in:
commit
edf0df64bf
|
@ -46,18 +46,10 @@
|
|||
# (Optional) Whether to enable the powerstore backend
|
||||
# Defaults to false
|
||||
#
|
||||
# [*cinder_enable_dellemc_vmax_iscsi_backend*]
|
||||
# (Optional) Whether to enable the vmax iscsi backend
|
||||
# Defaults to false
|
||||
#
|
||||
# [*cinder_enable_dellemc_vnx_backend*]
|
||||
# (Optional) Whether to enable the vnx backend
|
||||
# Defaults to false
|
||||
#
|
||||
# [*cinder_enable_dellemc_vxflexos_backend*]
|
||||
# (Optional) Whether to enable the vxflexos backend
|
||||
# Defaults to false
|
||||
#
|
||||
# [*cinder_enable_dellemc_xtremio_backend*]
|
||||
# (Optional) Whether to enable the xtremio backend
|
||||
# Defaults to false
|
||||
|
@ -78,10 +70,6 @@
|
|||
# (Optional) Whether to enable the rbd backend
|
||||
# Defaults to false
|
||||
#
|
||||
# [*cinder_enable_scaleio_backend*]
|
||||
# (Optional) Whether to enable the scaleio backend
|
||||
# Defaults to false
|
||||
#
|
||||
#[*cinder_enable_nvmeof_backend*]
|
||||
# (Optional) Whether to enable the NVMeOF backend
|
||||
# Defaults to false
|
||||
|
@ -137,15 +125,12 @@ class tripleo::profile::base::cinder::volume (
|
|||
$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,
|
||||
$cinder_enable_dellemc_vnx_backend = false,
|
||||
$cinder_enable_dellemc_vxflexos_backend = false,
|
||||
$cinder_enable_dellemc_xtremio_backend = false,
|
||||
$cinder_enable_iscsi_backend = true,
|
||||
$cinder_enable_netapp_backend = false,
|
||||
$cinder_enable_nfs_backend = false,
|
||||
$cinder_enable_rbd_backend = false,
|
||||
$cinder_enable_scaleio_backend = false,
|
||||
$cinder_enable_nvmeof_backend = false,
|
||||
$cinder_user_enabled_backends = hiera('cinder_user_enabled_backends', undef),
|
||||
$cinder_volume_cluster = '',
|
||||
|
@ -244,14 +229,6 @@ class tripleo::profile::base::cinder::volume (
|
|||
$cinder_dellemc_powerstore_backend_name = undef
|
||||
}
|
||||
|
||||
if $cinder_enable_dellemc_vmax_iscsi_backend {
|
||||
include tripleo::profile::base::cinder::volume::dellemc_vmax_iscsi
|
||||
$cinder_dellemc_vmax_iscsi_backend_name = hiera('cinder::backend::dellemc_vmax_iscsi::volume_backend_name',
|
||||
'tripleo_dellemc_vmax_iscsi')
|
||||
} else {
|
||||
$cinder_dellemc_vmax_iscsi_backend_name = undef
|
||||
}
|
||||
|
||||
if $cinder_enable_dellemc_vnx_backend {
|
||||
include tripleo::profile::base::cinder::volume::dellemc_vnx
|
||||
$cinder_dellemc_vnx_backend_name = hiera('cinder::backend::emc_vnx::volume_backend_name',
|
||||
|
@ -260,14 +237,6 @@ class tripleo::profile::base::cinder::volume (
|
|||
$cinder_dellemc_vnx_backend_name = undef
|
||||
}
|
||||
|
||||
if $cinder_enable_dellemc_vxflexos_backend {
|
||||
include tripleo::profile::base::cinder::volume::dellemc_vxflexos
|
||||
$cinder_dellemc_vxflexos_backend_name = hiera('cinder::backend::dellemc_vxflexos::volume_backend_name',
|
||||
'tripleo_dellemc_vxflexos')
|
||||
} else {
|
||||
$cinder_dellemc_vxflexos_backend_name = undef
|
||||
}
|
||||
|
||||
if $cinder_enable_dellemc_xtremio_backend {
|
||||
include tripleo::profile::base::cinder::volume::dellemc_xtremio
|
||||
$cinder_dellemc_xtremio_backend_name = hiera('cinder::backend::dellemc_xtremio::volume_backend_name',
|
||||
|
@ -325,13 +294,6 @@ class tripleo::profile::base::cinder::volume (
|
|||
$cinder_rbd_extra_backend_names = undef
|
||||
}
|
||||
|
||||
if $cinder_enable_scaleio_backend {
|
||||
include tripleo::profile::base::cinder::volume::scaleio
|
||||
$cinder_scaleio_backend_name = hiera('cinder::backend::scaleio::volume_backend_name', 'tripleo_scaleio')
|
||||
} else {
|
||||
$cinder_scaleio_backend_name = undef
|
||||
}
|
||||
|
||||
if $cinder_enable_nvmeof_backend {
|
||||
include tripleo::profile::base::cinder::volume::nvmeof
|
||||
$cinder_nvmeof_backend_name = hiera('cinder::backend::nvmeof::volume_backend_name', 'tripleo_nvmeof')
|
||||
|
@ -349,13 +311,10 @@ class tripleo::profile::base::cinder::volume (
|
|||
$cinder_dellemc_powerflex_backend_name,
|
||||
$cinder_dellemc_powermax_backend_name,
|
||||
$cinder_dellemc_powerstore_backend_name,
|
||||
$cinder_dellemc_vmax_iscsi_backend_name,
|
||||
$cinder_dellemc_vnx_backend_name,
|
||||
$cinder_dellemc_vxflexos_backend_name,
|
||||
$cinder_dellemc_xtremio_backend_name,
|
||||
$cinder_netapp_backend_name,
|
||||
$cinder_nfs_backend_name,
|
||||
$cinder_scaleio_backend_name,
|
||||
$cinder_user_enabled_backends,
|
||||
$cinder_nvmeof_backend_name))
|
||||
# NOTE(aschultz): during testing it was found that puppet 3 may incorrectly
|
||||
|
|
|
@ -1,45 +0,0 @@
|
|||
# Copyright (c) 2016-2017 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_vmax_iscsi
|
||||
#
|
||||
# Cinder Volume dellemc_vmax_iscsi profile for tripleo
|
||||
#
|
||||
# === Parameters
|
||||
#
|
||||
# [*backend_name*]
|
||||
# (Optional) Name given to the Cinder backend stanza
|
||||
# Defaults to 'tripleo_dellemc_vmax_iscsi'
|
||||
#
|
||||
# [*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_vmax_iscsi (
|
||||
$backend_name = hiera('cinder::backend::dellemc_vmax_iscsi::volume_backend_name', 'tripleo_dellemc_vmax_iscsi'),
|
||||
$step = Integer(hiera('step')),
|
||||
) {
|
||||
include tripleo::profile::base::cinder::volume
|
||||
|
||||
warning('The tripleo_dellemc_vmax_iscsi class is not supported, please use the triplo_dellemc_powermax resource instead.')
|
||||
|
||||
if $step >= 4 {
|
||||
create_resources('cinder::backend::dellemc_vmax_iscsi', { $backend_name => delete_undef_values({
|
||||
'backend_availability_zone' => hiera('cinder::backend::dellemc_vmax_iscsi::backend_availability_zone', undef),
|
||||
'cinder_emc_config_file' => hiera('cinder::backend::dellemc_vmax_iscsi::cinder_emc_config_file', undef),
|
||||
})})
|
||||
}
|
||||
|
||||
}
|
|
@ -1,57 +0,0 @@
|
|||
# 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_vxflexos
|
||||
#
|
||||
# Cinder Volume dellemc_vxflexos profile for tripleo
|
||||
#
|
||||
# === Parameters
|
||||
#
|
||||
# [*backend_name*]
|
||||
# (Optional) Name given to the Cinder backend stanza
|
||||
# Defaults to 'tripleo_dellemc_vxflexos'
|
||||
#
|
||||
# [*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_vxflexos (
|
||||
$backend_name = hiera('cinder::backend::dellemc_vxflexos::volume_backend_name', 'tripleo_dellemc_vxflexos'),
|
||||
$step = Integer(hiera('step')),
|
||||
) {
|
||||
include tripleo::profile::base::cinder::volume
|
||||
|
||||
warning('The dellemc_vxflexos class will be removed in W-Release, please use dellemc_powerflex instead.')
|
||||
|
||||
if $step >= 4 {
|
||||
create_resources('cinder::backend::dellemc_vxflexos', { $backend_name => delete_undef_values({
|
||||
'backend_availability_zone' => hiera('cinder::backend::dellemc_vxflexos::backend_availability_zone', undef),
|
||||
'san_login' => hiera('cinder::backend::dellemc_vxflexos::san_login', undef),
|
||||
'san_password' => hiera('cinder::backend::dellemc_vxflexos::san_password', undef),
|
||||
'san_ip' => hiera('cinder::backend::dellemc_vxflexos::san_ip', undef),
|
||||
'vxflexos_storage_pools' => hiera('cinder::backend::dellemc_vxflexos::vxflexos_storage_pools', undef),
|
||||
'vxflexos_allow_migration_during_rebuild' => hiera('cinder::backend::dellemc_vxflexos::vxflexos_allow_migration_during_rebuild', undef),
|
||||
'vxflexos_allow_non_padded_volumes' => hiera('cinder::backend::dellemc_vxflexos::vxflexos_allow_non_padded_volumes', undef),
|
||||
'vxflexos_max_over_subscription_ratio' => hiera('cinder::backend::dellemc_vxflexos::vxflexos_max_over_subscription_ratio', undef),
|
||||
'vxflexos_rest_server_port' => hiera('cinder::backend::dellemc_vxflexos::vxflexos_rest_server_port', undef),
|
||||
'vxflexos_round_volume_capacity' => hiera('cinder::backend::dellemc_vxflexos::vxflexos_round_volume_capacity', undef),
|
||||
'vxflexos_server_api_version' => hiera('cinder::backend::dellemc_vxflexos::vxflexos_server_api_version', undef),
|
||||
'vxflexos_unmap_volume_before_deletion' => hiera('cinder::backend::dellemc_vxflexos::vxflexos_unmap_volume_before_deletion', undef),
|
||||
'san_thin_provision' => hiera('cinder::backend::dellemc_vxflexos::san_thin_provision', undef),
|
||||
'driver_ssl_cert_verify' => hiera('cinder::backend::dellemc_vxflexos::driver_ssl_cert_verify', undef),
|
||||
'driver_ssl_cert_path' => hiera('cinder::backend::dellemc_vxflexos::driver_ssl_cert_path', undef)
|
||||
})})
|
||||
}
|
||||
}
|
|
@ -1,60 +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::scaleio
|
||||
#
|
||||
# Cinder Volume scaleio profile for tripleo
|
||||
#
|
||||
# === Parameters
|
||||
#
|
||||
# [*backend_name*]
|
||||
# (Optional) Name given to the Cinder backend stanza
|
||||
# Defaults to 'tripleo_scaleio'
|
||||
#
|
||||
# [*step*]
|
||||
# (Optional) The current step in deployment. See tripleo-heat-templates
|
||||
# for more details.
|
||||
# Defaults to hiera('step')
|
||||
#
|
||||
class tripleo::profile::base::cinder::volume::scaleio (
|
||||
$backend_name = hiera('cinder::backend::scaleio::volume_backend_name', 'tripleo_scaleio'),
|
||||
$step = Integer(hiera('step')),
|
||||
) {
|
||||
include tripleo::profile::base::cinder::volume
|
||||
|
||||
|
||||
warning('The scaleio class will be removed in W-Release, please use the dellemc_vxflexos resource instead.')
|
||||
|
||||
if $step >= 4 {
|
||||
create_resources('cinder::backend::scaleio', { $backend_name => delete_undef_values({
|
||||
'backend_availability_zone' => hiera('cinder::backend::scaleio::backend_availability_zone', undef),
|
||||
'sio_login' => hiera('cinder::backend::scaleio::sio_login', undef),
|
||||
'sio_password' => hiera('cinder::backend::scaleio::sio_password', undef),
|
||||
'sio_server_hostname' => hiera('cinder::backend::scaleio::sio_server_hostname', undef),
|
||||
'sio_server_port' => hiera('cinder::backend::scaleio::sio_server_port', undef),
|
||||
'sio_verify_server_certificate' => hiera('cinder::backend::scaleio::sio_verify_server_certificate', undef),
|
||||
'sio_server_certificate_path' => hiera('cinder::backend::scaleio::sio_server_certificate_path', undef),
|
||||
'sio_protection_domain_name' => hiera('cinder::backend::scaleio::sio_protection_domain_name', undef),
|
||||
'sio_protection_domain_id' => hiera('cinder::backend::scaleio::sio_protection_domain_id', undef),
|
||||
'sio_storage_pool_id' => hiera('cinder::backend::scaleio::sio_storage_pool_id', undef),
|
||||
'sio_storage_pool_name' => hiera('cinder::backend::scaleio::sio_storage_pool_name', undef),
|
||||
'sio_storage_pools' => hiera('cinder::backend::scaleio::sio_storage_pools', undef),
|
||||
'sio_round_volume_capacity' => hiera('cinder::backend::scaleio::sio_round_volume_capacity', undef),
|
||||
'sio_unmap_volume_before_deletion' => hiera('cinder::backend::scaleio::sio_unmap_volume_before_deletion', undef),
|
||||
'sio_max_over_subscription_ratio' => hiera('cinder::backend::scaleio::sio_max_over_subscription_ratio', undef),
|
||||
'sio_thin_provision' => hiera('cinder::backend::scaleio::sio_thin_provision', undef),
|
||||
})})
|
||||
}
|
||||
|
||||
}
|
|
@ -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::scaleio' do
|
||||
shared_examples_for 'tripleo::profile::base::cinder::volume::scaleio' 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::scaleio')
|
||||
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__scaleio('tripleo_scaleio')
|
||||
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__scaleio('tripleo_scaleio')
|
||||
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::scaleio'
|
||||
end
|
||||
end
|
||||
end
|
|
@ -1,57 +0,0 @@
|
|||
# Copyright (c) 2016-2017 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_vmax_iscsi' do
|
||||
shared_examples_for 'tripleo::profile::base::cinder::volume::dellemc_vmax_iscsi' 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_vmax_iscsi')
|
||||
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_vmax_iscsi('tripleo_dellemc_vmax_iscsi')
|
||||
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_vmax_iscsi('tripleo_dellemc_vmax_iscsi')
|
||||
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_vmax_iscsi'
|
||||
end
|
||||
end
|
||||
end
|
|
@ -243,25 +243,6 @@ describe 'tripleo::profile::base::cinder::volume' do
|
|||
end
|
||||
end
|
||||
|
||||
context 'with only vxflexos' do
|
||||
before :each do
|
||||
params.merge!({
|
||||
:cinder_enable_dellemc_vxflexos_backend => true,
|
||||
:cinder_enable_iscsi_backend => false,
|
||||
})
|
||||
end
|
||||
it 'should configure only vxflexos' do
|
||||
is_expected.to contain_class('tripleo::profile::base::cinder::volume::dellemc_vxflexos')
|
||||
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_vxflexos']
|
||||
)
|
||||
end
|
||||
end
|
||||
|
||||
context 'with only netapp' do
|
||||
before :each do
|
||||
params.merge!({
|
||||
|
@ -355,7 +336,6 @@ describe 'tripleo::profile::base::cinder::volume' do
|
|||
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')
|
||||
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::rbd')
|
||||
|
@ -381,7 +361,6 @@ describe 'tripleo::profile::base::cinder::volume' do
|
|||
:cinder_enable_dellemc_sc_backend => true,
|
||||
:cinder_enable_dellsc_backend => true,
|
||||
:cinder_enable_dellemc_xtremio_backend => true,
|
||||
:cinder_enable_dellemc_vxflexos_backend => true,
|
||||
:cinder_enable_netapp_backend => true,
|
||||
})
|
||||
end
|
||||
|
@ -394,7 +373,6 @@ describe 'tripleo::profile::base::cinder::volume' do
|
|||
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')
|
||||
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::rbd')
|
||||
|
@ -403,8 +381,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_dellsc', 'tripleo_dellemc_sc','tripleo_dellemc_powerflex',
|
||||
'tripleo_dellemc_powermax', 'tripleo_dellemc_powerstore','tripleo_dellemc_vxflexos', 'tripleo_dellemc_xtremio',
|
||||
'tripleo_netapp','tripleo_nfs']
|
||||
'tripleo_dellemc_powermax', 'tripleo_dellemc_powerstore','tripleo_dellemc_xtremio','tripleo_netapp','tripleo_nfs']
|
||||
)
|
||||
end
|
||||
end
|
||||
|
|
|
@ -1,58 +0,0 @@
|
|||
#
|
||||
# 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_vxflexos' do
|
||||
shared_examples_for 'tripleo::profile::base::cinder::volume::dellemc_vxflexos' 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_vxflexos')
|
||||
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_vxflexos('tripleo_dellemc_vxflexos')
|
||||
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_vxflexos('tripleo_dellemc_vxflexos')
|
||||
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_vxflexos'
|
||||
end
|
||||
end
|
||||
end
|
|
@ -56,7 +56,6 @@ cinder::backend::dellemc_unity::san_ip: '172.23.8.101'
|
|||
cinder::backend::dellemc_unity::san_login: 'Admin'
|
||||
cinder::backend::dellemc_unity::san_password: 'password'
|
||||
cinder::backend::dellemc_unity::storage_protocol: 'iSCSI'
|
||||
cinder::backend::dellemc_vmax_iscsi::cinder_emc_config_file: '/etc/cinder/cinder_emc_config_CONF_GROUP_ISCSI.xml'
|
||||
cinder::backend::dellemc_xtremio::san_ip: '127.0.0.2'
|
||||
cinder::backend::dellemc_xtremio::san_login: 'admin'
|
||||
cinder::backend::dellemc_xtremio::san_password: 'password'
|
||||
|
@ -65,10 +64,6 @@ cinder::backend::dellsc_iscsi::san_ip: '172.23.8.101'
|
|||
cinder::backend::dellsc_iscsi::san_login: 'admin'
|
||||
cinder::backend::dellsc_iscsi::san_password: 'password'
|
||||
cinder::backend::dellsc_iscsi::dell_sc_ssn: '64720'
|
||||
cinder::backend::dellemc_vxflexos::san_login: 'admin'
|
||||
cinder::backend::dellemc_vxflexos::san_password: 'password'
|
||||
cinder::backend::dellemc_vxflexos::san_ip: '127.0.0.2'
|
||||
cinder::backend::dellemc_vxflexos::vxflexos_storage_pools: 'domain1:pool1,domain2:pool2'
|
||||
cinder::backend::emc_vnx::san_ip: '127.0.0.2'
|
||||
cinder::backend::emc_vnx::san_password: 'password'
|
||||
cinder::backend::netapp::netapp_login: 'netapp'
|
||||
|
@ -76,14 +71,6 @@ cinder::backend::netapp::netapp_password: 'password'
|
|||
cinder::backend::netapp::netapp_server_hostname: '127.0.0.2'
|
||||
cinder::backend::pure::san_ip: '127.0.0.2'
|
||||
cinder::backend::pure::pure_api_token: 'abc123def456ghi789'
|
||||
cinder::backend::scaleio::sio_login: 'admin'
|
||||
cinder::backend::scaleio::sio_password: 'password'
|
||||
cinder::backend::scaleio::sio_server_hostname: 'scaleio.example.com'
|
||||
cinder::backend::scaleio::sio_protection_domain_id: 'domainid1'
|
||||
cinder::backend::scaleio::sio_protection_domain_name: 'domain1'
|
||||
cinder::backend::scaleio::sio_storage_pool_id: 'poolid1'
|
||||
cinder::backend::scaleio::sio_storage_pool_name: 'pool1'
|
||||
cinder::backend::scaleio::sio_storage_pools: 'domain1:pool1,domain2:pool2'
|
||||
# designate related items
|
||||
designate_central_short_bootstrap_node_name: node
|
||||
designate::keystone::authtoken::password: 'password'
|
||||
|
|
Loading…
Reference in New Issue