Add support for MultiStrOpt

This replaces the provider implementation of designate_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: Ibba47194e745d37607f20316674e168d342e0f85
This commit is contained in:
Takashi Kajinami 2021-07-13 17:53:57 +09:00
parent 66f45e38d2
commit 5c47db969b
4 changed files with 21 additions and 12 deletions

View File

@ -1,6 +1,6 @@
Puppet::Type.type(:designate_config).provide( Puppet::Type.type(:designate_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(:designate_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

@ -2,7 +2,7 @@
# these tests are a little concerning b/c they are hacking around the # 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 # modulepath, so these tests will not catch issues that may eventually arise
# related to loading these plugins. # related to loading these plugins.
# I could not, for the life of me, figure out how to programatcally set the modulepath # 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__),
@ -26,12 +26,12 @@ $LOAD_PATH.push(
'lib') 'lib')
) )
require 'spec_helper' require 'spec_helper'
provider_class = Puppet::Type.type(:designate_config).provider(:ini_setting) provider_class = Puppet::Type.type(:designate_config).provider(:openstackconfig)
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::Designate_config.new( resource = Puppet::Type::Designate_config.new(
{:name => 'DEFAULT/foo', :value => 'plop'} {: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')
@ -40,11 +40,11 @@ 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::Designate_config.new( resource = Puppet::Type::Designate_config.new(
{:name => 'boo/zoo', :value => 'plop'} {:name => 'dude/foo', :value => 'bar'}
) )
provider = provider_class.new(resource) provider = provider_class.new(resource)
expect(provider.section).to eq('boo') expect(provider.section).to eq('dude')
expect(provider.setting).to eq('zoo') expect(provider.setting).to eq('foo')
end end
it 'should ensure absent when <SERVICE DEFAULT> is specified as a value' do it 'should ensure absent when <SERVICE DEFAULT> is specified as a value' do
@ -64,4 +64,5 @@ describe provider_class do
provider.exists? provider.exists?
expect(resource[:ensure]).to eq :absent expect(resource[:ensure]).to eq :absent
end end
end end

View File

@ -30,12 +30,12 @@ describe 'Puppet::Type.type(:designate_config)' do
it 'should accept a valid value' do it 'should accept a valid value' do
@designate_config[:value] = 'bar' @designate_config[:value] = 'bar'
expect(@designate_config[:value]).to eq('bar') expect(@designate_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
@designate_config[:value] = 'b ar' @designate_config[:value] = 'b ar'
expect(@designate_config[:value]).to eq('b ar') expect(@designate_config[:value]).to eq(['b ar'])
end end
it 'should accept valid ensure values' do it 'should accept valid ensure values' do