Add support for MultiStrOpt

This replaces the provider implementation of aodh_config type so that
MultiStrOpt, which is used by several options like
 - oslo_messaging_notifications/driver
 - oslo_policy/policy_dirs
are handled correctly.

Change-Id: I4cea52da9531b68598c0d7429fb2ed581ab6c4f7
This commit is contained in:
Takashi Kajinami 2021-12-27 16:22:54 +09:00
parent 1261e9ad08
commit 553f60ab10
4 changed files with 15 additions and 7 deletions

View File

@ -1,6 +1,6 @@
Puppet::Type.type(:zaqar_config).provide(
:ini_setting,
:parent => Puppet::Type.type(:openstack_config).provider(:ini_setting)
:openstackconfig,
:parent => Puppet::Type.type(:openstack_config).provider(:ruby)
) do
def self.file_path

View File

@ -7,14 +7,22 @@ Puppet::Type.newtype(:zaqar_config) do
newvalues(/\S+\/\S+/)
end
newproperty(:value) do
newproperty(:value, :array_matching => :all) do
desc 'The value of the setting to be defined.'
def insync?(is)
return true if @should.empty?
return false unless is.is_a? Array
return false unless is.length == @should.length
return (
is & @should == is or
is & @should.map(&:to_s) == is
)
end
munge do |value|
value = value.to_s.strip
value.capitalize! if value =~ /^(true|false)$/i
value
end
newvalues(/^[\S ]*$/)
def is_to_s( currentvalue )
if resource.secret?

View File

@ -26,7 +26,7 @@ $LOAD_PATH.push(
)
require 'spec_helper'
provider_class = Puppet::Type.type(:zaqar_config).provider(:ini_setting)
provider_class = Puppet::Type.type(:zaqar_config).provider(:openstackconfig)
describe provider_class do
it 'should default to the default setting when no other one is specified' do

View File

@ -29,12 +29,12 @@ describe 'Puppet::Type.type(:zaqar_config)' do
it 'should accept a valid value' do
@zaqar_config[:value] = 'bar'
expect(@zaqar_config[:value]).to eq('bar')
expect(@zaqar_config[:value]).to eq(['bar'])
end
it 'should not accept a value with whitespace' do
@zaqar_config[:value] = 'b ar'
expect(@zaqar_config[:value]).to eq('b ar')
expect(@zaqar_config[:value]).to eq(['b ar'])
end
it 'should accept valid ensure values' do