openstack
/
puppet-swift
Code Issues Proposed changes

Do not hardcode default of [ksm_keymaster] meta_version_to_write 

meta_version_to_write=1 should be used until swift is upgraded from
2.20.0(Stein), but that version is quite old and we don't expect
current puppet-swift is used with such old version.

Also, meta_version_to_write=2 should be used until swift is upgrade
from 2.25.0(Ussuri) but again this version is too old and out of our
current support scope.

This change removes the hard-coded default(1) so that the latest value
(3) is used instead.

Change-Id: I87fe552e9a8d7f7214985c1ecb7abfff1f1abb18
This commit is contained in:
Takashi Kajinami 2022-01-25 21:47:06 +09:00
parent 95c974c27d
commit ceaf421eb8
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/keymaster.pp
View File

@ -58,7 +58,7 @@
#
# [*meta_version_to_write*]
# (Optional) Int. The version of crypto metadata to write.
# Defaults to 1.
# Defaults to $::os_service_default
#
# == Dependencies
#
@ -80,7 +80,7 @@ class swift::keymaster(
$user_domain_name = undef,
$project_domain_id = 'default',
$user_domain_id = 'default',
$meta_version_to_write = 1,
$meta_version_to_write = $::os_service_default,
) {
include swift::deps

2
spec/classes/swift_keymaster.rb
View File

@ -8,7 +8,7 @@ describe 'swift::keymaster' do
it { is_expected.to contain_swift_keymaster_config('kms_keymaster/project_name').with_value('services') }
it { is_expected.to contain_swift_keymaster_config('kms_keymaster/project_domain_id').with_value('default') }
it { is_expected.to contain_swift_keymaster_config('kms_keymaster/user_domain_id').with_value('default') }
it { is_expected.to contain_swift_keymaster_config('kms_keymaster/meta_version_to_write').with_value('1') }
it { is_expected.to contain_swift_keymaster_config('kms_keymaster/meta_version_to_write').with_value('<SERVICE DEFAULT>') }
end
describe "when overriding default parameters" do