From fcfffb1fcae33981953369e0bb9050abbeb67e01 Mon Sep 17 00:00:00 2001 From: Rocky Date: Wed, 25 Aug 2021 16:46:13 +1000 Subject: [PATCH] Fix the lvm_share_export_ips typo Change-Id: I5cb24d4a556fcba5b4d4e4bf87570b95adb6b76e --- manifests/backend/lvm.pp | 6 +++--- .../notes/lvm_share_export_ips-397716e813e7b44f.yaml | 6 ++++++ spec/defines/manila_backend_lvm_spec.rb | 4 ++-- 3 files changed, 11 insertions(+), 5 deletions(-) create mode 100644 releasenotes/notes/lvm_share_export_ips-397716e813e7b44f.yaml diff --git a/manifests/backend/lvm.pp b/manifests/backend/lvm.pp index a2715c1d..48bb437c 100644 --- a/manifests/backend/lvm.pp +++ b/manifests/backend/lvm.pp @@ -4,7 +4,7 @@ # Configures Manila to use LVM as a share driver # # === Parameters -# [*lvm_share_export_ip*] +# [*lvm_share_export_ips*] # (required) List of IPs to export shares belonging to the LVM storage driver. # # [*share_backend_name*] @@ -36,7 +36,7 @@ # Defaults to: $::os_service_default # define manila::backend::lvm ( - $lvm_share_export_ip, + $lvm_share_export_ips, $share_backend_name = $name, $driver_handles_share_servers = $::os_service_default, $lvm_share_export_root = $::os_service_default, @@ -52,7 +52,7 @@ define manila::backend::lvm ( "${name}/share_backend_name": value => $share_backend_name; "${name}/share_driver": value => $share_driver; "${name}/driver_handles_share_servers": value => $driver_handles_share_servers; - "${name}/lvm_share_export_ip": value => $lvm_share_export_ip; + "${name}/lvm_share_export_ips": value => join(any2array($lvm_share_export_ips),','); "${name}/lvm_share_export_root": value => $lvm_share_export_root; "${name}/lvm_share_mirrors": value => $lvm_share_mirrors; "${name}/lvm_share_volume_group": value => $lvm_share_volume_group; diff --git a/releasenotes/notes/lvm_share_export_ips-397716e813e7b44f.yaml b/releasenotes/notes/lvm_share_export_ips-397716e813e7b44f.yaml new file mode 100644 index 00000000..cdbac699 --- /dev/null +++ b/releasenotes/notes/lvm_share_export_ips-397716e813e7b44f.yaml @@ -0,0 +1,6 @@ +--- +fixes: + - | + Fixed usage of the removed ``lvm_share_export_ip`` parameter in + the ``manila::backend::lvm`` resource typeo. + Now the ``lvm_share_export_ips`` should be used instead. diff --git a/spec/defines/manila_backend_lvm_spec.rb b/spec/defines/manila_backend_lvm_spec.rb index 470d42be..38530d74 100644 --- a/spec/defines/manila_backend_lvm_spec.rb +++ b/spec/defines/manila_backend_lvm_spec.rb @@ -8,7 +8,7 @@ describe 'manila::backend::lvm' do let :params do { :driver_handles_share_servers => false, - :lvm_share_export_ip => '1.2.3.4', + :lvm_share_export_ips => '1.2.3.4', :lvm_share_export_root => '$state_path/mnt', :lvm_share_mirrors => 1, :lvm_share_volume_group => 'lvm-shares', @@ -21,7 +21,7 @@ describe 'manila::backend::lvm' do is_expected.to contain_manila_config('mylvm/share_driver').with_value( 'manila.share.drivers.lvm.LVMShareDriver') is_expected.to contain_manila_config('mylvm/driver_handles_share_servers').with_value(false) - is_expected.to contain_manila_config('mylvm/lvm_share_export_ip').with_value('1.2.3.4') + is_expected.to contain_manila_config('mylvm/lvm_share_export_ips').with_value('1.2.3.4') is_expected.to contain_manila_config('mylvm/lvm_share_export_root').with_value('$state_path/mnt') is_expected.to contain_manila_config('mylvm/lvm_share_mirrors').with_value('1') is_expected.to contain_manila_config('mylvm/lvm_share_volume_group').with_value('lvm-shares')