Add support for MultiStrOpt

This replaces the provider implementation of ironic_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: Icbc4d60d2538317c05ff5760359b45327abfb533
This commit is contained in:
Takashi Kajinami
2021-07-13 17:47:11 +09:00
parent 1904baa3cc
commit 0f4a5263a7
4 changed files with 24 additions and 21 deletions

View File

@@ -1,11 +1,10 @@
require File.join(File.dirname(__FILE__), '..','..','..', 'puppet/provider/ironic') require File.join(File.dirname(__FILE__), '..','..','..', 'puppet/provider/ironic')
Puppet::Type.type(:ironic_config).provide( Puppet::Type.type(:ironic_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
'/etc/ironic/ironic.conf' '/etc/ironic/ironic.conf'
end end
@@ -38,5 +37,4 @@ Puppet::Type.type(:ironic_config).provide(
res = openstack.openstack_request('project', 'show', properties) res = openstack.openstack_request('project', 'show', properties)
return "AUTH_#{res[:name]}" return "AUTH_#{res[:name]}"
end end
end end

View File

@@ -7,14 +7,22 @@ Puppet::Type.newtype(:ironic_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(:ironic_config).provider(:openstackconfig)
provider_class = Puppet::Type.type(:ironic_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::Ironic_config.new( resource = Puppet::Type::Ironic_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::Ironic_config.new( resource = Puppet::Type::Ironic_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')
@@ -68,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(:ironic_config)' do
it 'should accept a valid value' do it 'should accept a valid value' do
@ironic_config[:value] = 'bar' @ironic_config[:value] = 'bar'
expect(@ironic_config[:value]).to eq('bar') expect(@ironic_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
@ironic_config[:value] = 'b ar' @ironic_config[:value] = 'b ar'
expect(@ironic_config[:value]).to eq('b ar') expect(@ironic_config[:value]).to eq(['b ar'])
end end
it 'should accept valid ensure values' do it 'should accept valid ensure values' do