Merge "Support for Dell EMC Unity Cinder Driver"
This commit is contained in:
commit
85f5cc23d4
|
@ -26,6 +26,10 @@
|
||||||
# (Optional) Whether to enable the delsc backend
|
# (Optional) Whether to enable the delsc backend
|
||||||
# Defaults to false
|
# Defaults to false
|
||||||
#
|
#
|
||||||
|
# [*cinder_enable_dellemc_unity_backend*]
|
||||||
|
# (Optional) Whether to enable the unity backend
|
||||||
|
# Defaults to false
|
||||||
|
#
|
||||||
# [*cinder_enable_hpelefthand_backend*]
|
# [*cinder_enable_hpelefthand_backend*]
|
||||||
# (Optional) Whether to enable the hpelefthand backend
|
# (Optional) Whether to enable the hpelefthand backend
|
||||||
# Defaults to false
|
# Defaults to false
|
||||||
|
@ -68,18 +72,19 @@
|
||||||
# Defaults to hiera('step')
|
# Defaults to hiera('step')
|
||||||
#
|
#
|
||||||
class tripleo::profile::base::cinder::volume (
|
class tripleo::profile::base::cinder::volume (
|
||||||
$cinder_enable_pure_backend = false,
|
$cinder_enable_pure_backend = false,
|
||||||
$cinder_enable_dellsc_backend = false,
|
$cinder_enable_dellsc_backend = false,
|
||||||
$cinder_enable_hpelefthand_backend = false,
|
$cinder_enable_dellemc_unity_backend = false,
|
||||||
$cinder_enable_dellps_backend = false,
|
$cinder_enable_hpelefthand_backend = false,
|
||||||
$cinder_enable_iscsi_backend = true,
|
$cinder_enable_dellps_backend = false,
|
||||||
$cinder_enable_netapp_backend = false,
|
$cinder_enable_iscsi_backend = true,
|
||||||
$cinder_enable_nfs_backend = false,
|
$cinder_enable_netapp_backend = false,
|
||||||
$cinder_enable_rbd_backend = false,
|
$cinder_enable_nfs_backend = false,
|
||||||
$cinder_enable_scaleio_backend = false,
|
$cinder_enable_rbd_backend = false,
|
||||||
$cinder_enable_vrts_hs_backend = false,
|
$cinder_enable_scaleio_backend = false,
|
||||||
$cinder_user_enabled_backends = hiera('cinder_user_enabled_backends', undef),
|
$cinder_enable_vrts_hs_backend = false,
|
||||||
$step = Integer(hiera('step')),
|
$cinder_user_enabled_backends = hiera('cinder_user_enabled_backends', undef),
|
||||||
|
$step = Integer(hiera('step')),
|
||||||
) {
|
) {
|
||||||
include ::tripleo::profile::base::cinder
|
include ::tripleo::profile::base::cinder
|
||||||
|
|
||||||
|
@ -100,6 +105,13 @@ class tripleo::profile::base::cinder::volume (
|
||||||
$cinder_dellsc_backend_name = undef
|
$cinder_dellsc_backend_name = undef
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if $cinder_enable_dellemc_unity_backend {
|
||||||
|
include ::tripleo::profile::base::cinder::volume::dellemc_unity
|
||||||
|
$cinder_dellemc_unity_backend_name = hiera('cinder::backend::dellemc_unity::volume_backend_name', 'tripleo_dellemc_unity')
|
||||||
|
} else {
|
||||||
|
$cinder_dellemc_unity_backend_name = undef
|
||||||
|
}
|
||||||
|
|
||||||
if $cinder_enable_hpelefthand_backend {
|
if $cinder_enable_hpelefthand_backend {
|
||||||
include ::tripleo::profile::base::cinder::volume::hpelefthand
|
include ::tripleo::profile::base::cinder::volume::hpelefthand
|
||||||
$cinder_hpelefthand_backend_name = hiera('cinder::backend::hpelefthand_iscsi::volume_backend_name', 'tripleo_hpelefthand')
|
$cinder_hpelefthand_backend_name = hiera('cinder::backend::hpelefthand_iscsi::volume_backend_name', 'tripleo_hpelefthand')
|
||||||
|
@ -161,6 +173,7 @@ class tripleo::profile::base::cinder::volume (
|
||||||
$cinder_pure_backend_name,
|
$cinder_pure_backend_name,
|
||||||
$cinder_dellps_backend_name,
|
$cinder_dellps_backend_name,
|
||||||
$cinder_dellsc_backend_name,
|
$cinder_dellsc_backend_name,
|
||||||
|
$cinder_dellemc_unity_backend_name,
|
||||||
$cinder_hpelefthand_backend_name,
|
$cinder_hpelefthand_backend_name,
|
||||||
$cinder_netapp_backend_name,
|
$cinder_netapp_backend_name,
|
||||||
$cinder_nfs_backend_name,
|
$cinder_nfs_backend_name,
|
||||||
|
|
|
@ -0,0 +1,47 @@
|
||||||
|
# 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_unity
|
||||||
|
#
|
||||||
|
# Cinder Volume dellemc_unity profile for tripleo
|
||||||
|
#
|
||||||
|
# === Parameters
|
||||||
|
#
|
||||||
|
# [*backend_name*]
|
||||||
|
# (Optional) Name given to the Cinder backend stanza
|
||||||
|
# Defaults to 'tripleo_dellemc_unity'
|
||||||
|
#
|
||||||
|
# [*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_unity (
|
||||||
|
$backend_name = hiera('cinder::backend::dellemc_unity::volume_backend_name', 'tripleo_dellemc_unity'),
|
||||||
|
$step = Integer(hiera('step')),
|
||||||
|
) {
|
||||||
|
include ::tripleo::profile::base::cinder::volume
|
||||||
|
|
||||||
|
if $step >= 4 {
|
||||||
|
cinder::backend::dellemc_unity { $backend_name :
|
||||||
|
san_ip => hiera('cinder::backend::dellemc_unity::san_ip', undef),
|
||||||
|
san_login => hiera('cinder::backend::dellemc_unity::san_login', undef),
|
||||||
|
san_password => hiera('cinder::backend::dellemc_unity::san_password', undef),
|
||||||
|
storage_protocol => hiera('cinder::backend::dellemc_unity::storage_protocol', undef),
|
||||||
|
unity_io_ports => hiera('cinder::backend::dellemc_unity::unity_io_ports', undef),
|
||||||
|
unity_storage_pool_names => hiera('cinder::backend::dellemc_unity::unity_storage_pool_names', undef),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
|
@ -0,0 +1,57 @@
|
||||||
|
# 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_unity' do
|
||||||
|
shared_examples_for 'tripleo::profile::base::cinder::volume::dellemc_unity' 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_unity')
|
||||||
|
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_unity('tripleo_dellemc_unity')
|
||||||
|
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_unity('tripleo_dellemc_unity')
|
||||||
|
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_unity'
|
||||||
|
end
|
||||||
|
end
|
||||||
|
end
|
Loading…
Reference in New Issue