openstack/puppet-manila
Code Issues Proposed changes

Merge "Drop redundant hard-coded default of storage_availability_zone"

Browse Source
This commit is contained in:
Zuul 2024-10-07 15:47:59 +00:00 committed by Gerrit Code Review
commit b2458d0cfa
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
manifests/init.pp
View File

@ -133,7 +133,7 @@
# #
# [*storage_availability_zone*] # [*storage_availability_zone*]
# (optional) Availability zone of the node. # (optional) Availability zone of the node.
# Defaults to 'nova' # Defaults to $facts['os_service_default']
# #
# [*rootwrap_config*] # [*rootwrap_config*]
# (optional) Path to the rootwrap configuration file to use for # (optional) Path to the rootwrap configuration file to use for
@ -232,7 +232,7 @@ class manila (
$cert_file = $facts['os_service_default'], $cert_file = $facts['os_service_default'],
$key_file = $facts['os_service_default'], $key_file = $facts['os_service_default'],
$api_paste_config = '/etc/manila/api-paste.ini', $api_paste_config = '/etc/manila/api-paste.ini',
$storage_availability_zone = 'nova', $storage_availability_zone = $facts['os_service_default'],
$rootwrap_config = '/etc/manila/rootwrap.conf', $rootwrap_config = '/etc/manila/rootwrap.conf',
$state_path = '/var/lib/manila', $state_path = '/var/lib/manila',
$lock_path = $::manila::params::lock_path, $lock_path = $::manila::params::lock_path,

2
spec/classes/manila_init_spec.rb
View File

@ -50,7 +50,7 @@ describe 'manila' do
:enable_cancel_on_failover => '<SERVICE DEFAULT>', :enable_cancel_on_failover => '<SERVICE DEFAULT>',
) )
is_expected.to contain_manila_config('DEFAULT/storage_availability_zone').with( is_expected.to contain_manila_config('DEFAULT/storage_availability_zone').with(
:value => 'nova' :value => '<SERVICE DEFAULT>'
) )
is_expected.to contain_manila_config('DEFAULT/api_paste_config').with( is_expected.to contain_manila_config('DEFAULT/api_paste_config').with(
:value => '/etc/manila/api-paste.ini' :value => '/etc/manila/api-paste.ini'