diff --git a/manifests/profile/base/cinder/volume.pp b/manifests/profile/base/cinder/volume.pp index 7e8f39bc2..cad9c19af 100644 --- a/manifests/profile/base/cinder/volume.pp +++ b/manifests/profile/base/cinder/volume.pp @@ -38,6 +38,10 @@ # (Optional) Whether to enable the vnx backend # Defaults to false # +# [*cinder_enable_dellemc_xtremio_iscsi_backend*] +# (Optional) Whether to enable the extremio iscsi backend +# Defaults to false +# # [*cinder_enable_hpelefthand_backend*] # (Optional) Whether to enable the hpelefthand backend # Defaults to false @@ -84,22 +88,23 @@ # Defaults to hiera('step') # class tripleo::profile::base::cinder::volume ( - $cinder_enable_pure_backend = false, - $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, - $cinder_enable_netapp_backend = false, - $cinder_enable_nfs_backend = false, - $cinder_enable_rbd_backend = false, - $cinder_enable_scaleio_backend = false, - $cinder_enable_vrts_hs_backend = false, - $cinder_user_enabled_backends = hiera('cinder_user_enabled_backends', undef), - $cinder_rbd_client_name = hiera('tripleo::profile::base::cinder::volume::rbd::cinder_rbd_user_name','openstack'), - $step = Integer(hiera('step')), + $cinder_enable_pure_backend = false, + $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_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, + $cinder_enable_rbd_backend = false, + $cinder_enable_scaleio_backend = false, + $cinder_enable_vrts_hs_backend = false, + $cinder_user_enabled_backends = hiera('cinder_user_enabled_backends', undef), + $cinder_rbd_client_name = hiera('tripleo::profile::base::cinder::volume::rbd::cinder_rbd_user_name','openstack'), + $step = Integer(hiera('step')), ) { include ::tripleo::profile::base::cinder @@ -143,6 +148,14 @@ class tripleo::profile::base::cinder::volume ( $cinder_dellemc_vnx_backend_name = undef } + if $cinder_enable_dellemc_xtremio_iscsi_backend { + include ::tripleo::profile::base::cinder::volume::dellemc_xtremio_iscsi + $cinder_dellemc_xtreamio_iscsi_backend_name = hiera('cinder::backend::dellemc_extremio_iscsi::volume_backend_name', + 'tripleo_dellemc_xtremio_iscsi') + } else { + $cinder_dellemc_xtremio_iscsi_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') @@ -224,6 +237,7 @@ class tripleo::profile::base::cinder::volume ( $cinder_dellemc_unity_backend_name, $cinder_dellemc_vmax_iscsi_backend_name, $cinder_dellemc_vnx_backend_name, + $cinder_dellemc_xtremio_iscsi_backend_name, $cinder_hpelefthand_backend_name, $cinder_netapp_backend_name, $cinder_nfs_backend_name, diff --git a/manifests/profile/base/cinder/volume/dellemc_xtremio_iscsi.pp b/manifests/profile/base/cinder/volume/dellemc_xtremio_iscsi.pp new file mode 100644 index 000000000..7aeba2b21 --- /dev/null +++ b/manifests/profile/base/cinder/volume/dellemc_xtremio_iscsi.pp @@ -0,0 +1,48 @@ +# 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_xtremio_iscsi +# +# Cinder Volume dellemc_xtremio_iscsi profile for tripleo +# +# === Parameters +# +# [*backend_name*] +# (Optional) Name given to the Cinder backend stanza +# Defaults to 'tripleo_dellemc_xtremio_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_xtremio_iscsi ( + $backend_name = hiera('cinder::backend::dellemc_xtremio_iscsi::volume_backend_name', 'tripleo_dellemc_xtremio_iscsi'), + $step = Integer(hiera('step')), +) { + include ::tripleo::profile::base::cinder::volume + + if $step >= 4 { + cinder::backend::dellemc_xtremio_iscsi { $backend_name : + san_ip => hiera('cinder::backend::dellemc_xtremio_iscsi::san_ip', undef), + san_login => hiera('cinder::backend::dellemc_xtremio_iscsi::san_login', undef), + san_password => hiera('cinder::backend::dellemc_xtremio_iscsi::san_password', undef), + xtremio_cluster_name => hiera('cinder::backend::dellemc_xtremio_iscsi::xtremio_cluster_name', undef), + xtremio_array_busy_retry_count => hiera('cinder::backend::dellemc_xtremio_iscsi::xtremio_array_busy_retry_count', undef), + xtremio_array_busy_retry_interval => hiera('cinder::backend::dellemc_xtremio_iscsi::xtremio_array_busy_retry_interval', undef), + xtremio_volumes_per_glance_cache => hiera('cinder::backend::dellemc_xtremio_iscsi::xtremio_volumes_per_glance_cache', undef), + } + } + +} diff --git a/releasenotes/notes/xtremio_driver_cea44d073cd161e7.yaml b/releasenotes/notes/xtremio_driver_cea44d073cd161e7.yaml new file mode 100644 index 000000000..a5759757b --- /dev/null +++ b/releasenotes/notes/xtremio_driver_cea44d073cd161e7.yaml @@ -0,0 +1,4 @@ +--- +features: + - | + Add support to configure Dell EMC Xtremio iscsi cinder backend diff --git a/spec/classes/tripleo_profile_base_cinder_xtremio_iscsi_spec.rb b/spec/classes/tripleo_profile_base_cinder_xtremio_iscsi_spec.rb new file mode 100644 index 000000000..527d65e8e --- /dev/null +++ b/spec/classes/tripleo_profile_base_cinder_xtremio_iscsi_spec.rb @@ -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_xtremio_iscsi' do + shared_examples_for 'tripleo::profile::base::cinder::volume::dellemc_xtremio_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_xtremio_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_xtreamio_iscsi('tripleo_dellemc_xtremio_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_xtremio_iscsi('tripleo_dellemc_xtremio_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_xtremio_iscsi' + end + end +end