openstack/puppet-manila
Code Issues Proposed changes

Drop redundant hard-coded default of storage_availability_zone

Browse Source 
The actual option in manila defaults to 'nova', so the service default
fact can be used, instead of hard-coding the same value.

Change-Id: I5efffbb0bd376fcb6cdcd0402f94756c35ca1315
This commit is contained in:
Takashi Kajinami 2024-10-07 12:25:58 +09:00
parent 51fbe71584
commit 6929165e08
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*]
# (optional) Availability zone of the node.
# Defaults to 'nova'
# Defaults to $facts['os_service_default']
#
# [*rootwrap_config*]
# (optional) Path to the rootwrap configuration file to use for
@ -232,7 +232,7 @@ class manila (
$cert_file = false,
$key_file = false,
$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',
$state_path = '/var/lib/manila',
$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>',
)
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(
:value => '/etc/manila/api-paste.ini'