commit d717538f272361bfacdf158168388a7fe60beee4 Author: Keigo Noha Date: Thu Aug 13 11:37:41 2020 +0900 Fix typos, extreamio and xtreamio to xtremio dellemc_extremio_iscsi is a wrong name. It has to be dellemc_xtremio_iscsi. And xtreamio should be xtremio. Conflicts: manifests/profile/base/cinder/volume.pp Change-Id: I7ba7b3ca151bf101742dc84ad80204cda42e2dbb (cherry picked from commit ef40cb9fce7ff3f74be55bdc93b0f10648a417c1) (cherry picked from commit 8c8fa833392da90787852bd3382c8ffea0319094) diff --git a/manifests/profile/base/cinder/volume.pp b/manifests/profile/base/cinder/volume.pp index 9a7cb2c..7dcc59f 100644 --- a/manifests/profile/base/cinder/volume.pp +++ b/manifests/profile/base/cinder/volume.pp @@ -39,7 +39,7 @@ # Defaults to false # # [*cinder_enable_dellemc_xtremio_iscsi_backend*] -# (Optional) Whether to enable the extremio iscsi backend +# (Optional) Whether to enable the xtremio iscsi backend # Defaults to false # # [*cinder_enable_hpelefthand_backend*] @@ -206,7 +206,7 @@ class tripleo::profile::base::cinder::volume ( 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', + $cinder_dellemc_xtremio_iscsi_backend_name = hiera('cinder::backend::dellemc_xtremio_iscsi::volume_backend_name', 'tripleo_dellemc_xtremio_iscsi') } else { $cinder_dellemc_xtremio_iscsi_backend_name = undef diff --git a/spec/classes/tripleo_profile_base_cinder_xtremio_iscsi_spec.rb b/spec/classes/tripleo_profile_base_cinder_xtremio_iscsi_spec.rb index 527d65e..be97ad5 100644 --- a/spec/classes/tripleo_profile_base_cinder_xtremio_iscsi_spec.rb +++ b/spec/classes/tripleo_profile_base_cinder_xtremio_iscsi_spec.rb @@ -28,7 +28,7 @@ describe 'tripleo::profile::base::cinder::volume::dellemc_xtremio_iscsi' 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') + is_expected.to_not contain_cinder__backend__dellemc_xtremio_iscsi('tripleo_dellemc_xtremio_iscsi') end end