Add support for MultiStrOpt

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

Change-Id: I3ef14d2c58735829ecbeed2cfe53515e57783a06
(cherry picked from commit 7db0f63ab1)
This commit is contained in:
Takashi Kajinami
2021-07-13 18:13:39 +09:00
parent 6707057402
commit e7557a5f60
4 changed files with 16 additions and 9 deletions

View File

@@ -1,6 +1,6 @@
Puppet::Type.type(:placement_config).provide( Puppet::Type.type(:placement_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(:placement_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,7 +26,7 @@ $LOAD_PATH.push(
'lib') 'lib')
) )
require 'spec_helper' require 'spec_helper'
provider_class = Puppet::Type.type(:placement_config).provider(:ini_setting) provider_class = Puppet::Type.type(:placement_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

View File

@@ -30,12 +30,12 @@ describe 'Puppet::Type.type(:placement_config)' do
it 'should accept a valid value' do it 'should accept a valid value' do
@placement_config[:value] = 'bar' @placement_config[:value] = 'bar'
expect(@placement_config[:value]).to eq('bar') expect(@placement_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
@placement_config[:value] = 'b ar' @placement_config[:value] = 'b ar'
expect(@placement_config[:value]).to eq('b ar') expect(@placement_config[:value]).to eq(['b ar'])
end end
it 'should accept valid ensure values' do it 'should accept valid ensure values' do
@@ -61,5 +61,4 @@ describe 'Puppet::Type.type(:placement_config)' do
expect(dependency[0].source).to eq(anchor) expect(dependency[0].source).to eq(anchor)
end end
end end