Add support for MultiStrOpt

This replaces the provider implementation of manila_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: Id09addfa7f930e0f2279dc114e68ca8a635b0d9d
This commit is contained in:
Takashi Kajinami 2021-07-13 17:57:55 +09:00
parent f855998ef7
commit d81d5226e2
4 changed files with 22 additions and 18 deletions

View File

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

View File

@ -7,14 +7,22 @@ Puppet::Type.newtype(:manila_config) do
newvalues(/\S+\/\S+/) newvalues(/\S+\/\S+/)
end end
newproperty(:value) do newproperty(:value, :array_matching => :all) do
desc 'The value of the setting to be defined.' 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| munge do |value|
value = value.to_s.strip value = value.to_s.strip
value.capitalize! if value =~ /^(true|false)$/i value.capitalize! if value =~ /^(true|false)$/i
value value
end end
newvalues(/^[\S ]*$/)
def is_to_s( currentvalue ) def is_to_s( currentvalue )
if resource.secret? if resource.secret?

View File

@ -1,3 +1,8 @@
#
# these tests are a little concerning b/c they are hacking around the
# modulepath, so these tests will not catch issues that may eventually arise
# related to loading these plugins.
# I could not, for the life of me, figure out how to programmatically set the modulepath
$LOAD_PATH.push( $LOAD_PATH.push(
File.join( File.join(
File.dirname(__FILE__), File.dirname(__FILE__),
@ -20,19 +25,13 @@ $LOAD_PATH.push(
'openstacklib', 'openstacklib',
'lib') 'lib')
) )
require 'spec_helper' require 'spec_helper'
provider_class = Puppet::Type.type(:manila_config).provider(:openstackconfig)
provider_class = Puppet::Type.type(:manila_config).provider(:ini_setting)
describe provider_class do describe provider_class do
it 'should default to the default setting when no other one is specified' do it 'should default to the default setting when no other one is specified' do
resource = Puppet::Type::Manila_config.new( resource = Puppet::Type::Manila_config.new(
{ {:name => 'DEFAULT/foo', :value => 'bar'}
:name => 'DEFAULT/foo',
:value => 'bar'
}
) )
provider = provider_class.new(resource) provider = provider_class.new(resource)
expect(provider.section).to eq('DEFAULT') expect(provider.section).to eq('DEFAULT')
@ -41,10 +40,7 @@ describe provider_class do
it 'should allow setting to be set explicitly' do it 'should allow setting to be set explicitly' do
resource = Puppet::Type::Manila_config.new( resource = Puppet::Type::Manila_config.new(
{ {:name => 'dude/foo', :value => 'bar'}
:name => 'dude/foo',
:value => 'bar'
}
) )
provider = provider_class.new(resource) provider = provider_class.new(resource)
expect(provider.section).to eq('dude') expect(provider.section).to eq('dude')

View File

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