Add support for Dell EMC VNX Cinder Backend
This change adds a new define for cinder::backend::emc_vnx Change-Id: Ieab9a66db78b61383dca4400e06cb1152660933a Implements: blueprint dellemc-vnx-cinder
This commit is contained in:
parent
614fb7414a
commit
aeb8482938
@ -34,6 +34,10 @@
|
||||
# (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_hpelefthand_backend*]
|
||||
# (Optional) Whether to enable the hpelefthand backend
|
||||
# Defaults to false
|
||||
@ -84,6 +88,7 @@ class tripleo::profile::base::cinder::volume (
|
||||
$cinder_enable_dellsc_backend = false,
|
||||
$cinder_enable_dellemc_unity_backend = false,
|
||||
$cinder_enable_dellemc_vmax_iscsi_backend = false,
|
||||
$cinder_enable_dellemc_vnx_backend = false,
|
||||
$cinder_enable_hpelefthand_backend = false,
|
||||
$cinder_enable_dellps_backend = false,
|
||||
$cinder_enable_iscsi_backend = true,
|
||||
@ -130,6 +135,14 @@ class tripleo::profile::base::cinder::volume (
|
||||
$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',
|
||||
'tripleo_dellemc_vnx')
|
||||
} else {
|
||||
$cinder_dellemc_vnx_backend_name = undef
|
||||
}
|
||||
|
||||
if $cinder_enable_hpelefthand_backend {
|
||||
include ::tripleo::profile::base::cinder::volume::hpelefthand
|
||||
$cinder_hpelefthand_backend_name = hiera('cinder::backend::hpelefthand_iscsi::volume_backend_name', 'tripleo_hpelefthand')
|
||||
@ -210,6 +223,7 @@ class tripleo::profile::base::cinder::volume (
|
||||
$cinder_dellsc_backend_name,
|
||||
$cinder_dellemc_unity_backend_name,
|
||||
$cinder_dellemc_vmax_iscsi_backend_name,
|
||||
$cinder_dellemc_vnx_backend_name,
|
||||
$cinder_hpelefthand_backend_name,
|
||||
$cinder_netapp_backend_name,
|
||||
$cinder_nfs_backend_name,
|
||||
|
53
manifests/profile/base/cinder/volume/dellemc_vnx.pp
Normal file
53
manifests/profile/base/cinder/volume/dellemc_vnx.pp
Normal file
@ -0,0 +1,53 @@
|
||||
# Copyright (c) 2016-2018 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_vnx
|
||||
#
|
||||
# Cinder Volume dellemc_vnx profile for tripleo
|
||||
#
|
||||
# === Parameters
|
||||
#
|
||||
# [*backend_name*]
|
||||
# (Optional) Name given to the Cinder backend stanza
|
||||
# Defaults to 'tripleo_dellemc_vnx'
|
||||
#
|
||||
# [*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_vnx (
|
||||
$backend_name = hiera('cinder::backend::emc_vnx::volume_backend_name', 'tripleo_dellemc_vnx'),
|
||||
$step = Integer(hiera('step')),
|
||||
) {
|
||||
include ::tripleo::profile::base::cinder::volume
|
||||
|
||||
if $step >= 4 {
|
||||
cinder::backend::emc_vnx { $backend_name :
|
||||
san_ip => hiera('cinder::backend::emc_vnx::san_ip', undef),
|
||||
san_login => hiera('cinder::backend::emc_vnx::san_login', undef),
|
||||
san_password => hiera('cinder::backend::emc_vnx::san_password', undef),
|
||||
storage_protocol => hiera('cinder::backend::emc_vnx::storage_protocol', undef),
|
||||
storage_vnx_pool_name => hiera('cinder::backend::emc_vnx::storage_vnx_pool_name', undef),
|
||||
default_timeout => hiera('cinder::backend::emc_vnx::default_timeout', undef),
|
||||
max_luns_per_storage_group => hiera('cinder::backend::emc_vnx::max_luns_per_storage_group', undef),
|
||||
initiator_auto_registration => hiera('cinder::backend::emc_vnx::initiator_auto_registration', undef),
|
||||
storage_vnx_auth_type => hiera('cinder::backend::emc_vnx::storage_vnx_auth_type', undef),
|
||||
storage_vnx_security_file_dir => hiera('cinder::backend::emc_vnx::storage_vnx_security_file_dir', undef),
|
||||
naviseccli_path => hiera('cinder::backend::emc_vnx::naviseccli_path', undef),
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
}
|
4
releasenotes/notes/vnx_driver_bea44d073cd161e7.yaml
Normal file
4
releasenotes/notes/vnx_driver_bea44d073cd161e7.yaml
Normal file
@ -0,0 +1,4 @@
|
||||
---
|
||||
features:
|
||||
- |
|
||||
Add support to configure Dell EMC VNX cinder backend
|
57
spec/classes/tripleo_profile_base_cinder_vnx_spec.rb
Normal file
57
spec/classes/tripleo_profile_base_cinder_vnx_spec.rb
Normal file
@ -0,0 +1,57 @@
|
||||
# Copyright (c) 2016-2018 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_vnx' do
|
||||
shared_examples_for 'tripleo::profile::base::cinder::volume::dellemc_vnx' 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_vnx')
|
||||
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__emc_vnx('tripleo_dellemc_vnx')
|
||||
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__emc_vnx('tripleo_dellemc_vnx')
|
||||
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_vnx'
|
||||
end
|
||||
end
|
||||
end
|
Loading…
Reference in New Issue
Block a user