From 0f4a5263a7f4264f6148e8c04f32992b0b07e1a5 Mon Sep 17 00:00:00 2001 From: Takashi Kajinami Date: Tue, 13 Jul 2021 17:47:11 +0900 Subject: [PATCH] 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 --- .../{ini_setting.rb => openstackconfig.rb} | 6 ++---- lib/puppet/type/ironic_config.rb | 12 +++++++++-- ...etting_spec.rb => openstackconfig_spec.rb} | 21 ++++++++----------- spec/unit/type/ironic_config_spec.rb | 6 +++--- 4 files changed, 24 insertions(+), 21 deletions(-) rename lib/puppet/provider/ironic_config/{ini_setting.rb => openstackconfig.rb} (92%) rename spec/unit/provider/ironic_config/{ini_setting_spec.rb => openstackconfig_spec.rb} (76%) diff --git a/lib/puppet/provider/ironic_config/ini_setting.rb b/lib/puppet/provider/ironic_config/openstackconfig.rb similarity index 92% rename from lib/puppet/provider/ironic_config/ini_setting.rb rename to lib/puppet/provider/ironic_config/openstackconfig.rb index cdfcca78..1c53b4ae 100644 --- a/lib/puppet/provider/ironic_config/ini_setting.rb +++ b/lib/puppet/provider/ironic_config/openstackconfig.rb @@ -1,11 +1,10 @@ require File.join(File.dirname(__FILE__), '..','..','..', 'puppet/provider/ironic') Puppet::Type.type(:ironic_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 '/etc/ironic/ironic.conf' end @@ -38,5 +37,4 @@ Puppet::Type.type(:ironic_config).provide( res = openstack.openstack_request('project', 'show', properties) return "AUTH_#{res[:name]}" end - end diff --git a/lib/puppet/type/ironic_config.rb b/lib/puppet/type/ironic_config.rb index dfab0d77..10c15547 100644 --- a/lib/puppet/type/ironic_config.rb +++ b/lib/puppet/type/ironic_config.rb @@ -7,14 +7,22 @@ Puppet::Type.newtype(:ironic_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? diff --git a/spec/unit/provider/ironic_config/ini_setting_spec.rb b/spec/unit/provider/ironic_config/openstackconfig_spec.rb similarity index 76% rename from spec/unit/provider/ironic_config/ini_setting_spec.rb rename to spec/unit/provider/ironic_config/openstackconfig_spec.rb index 5ea779a5..48984544 100644 --- a/spec/unit/provider/ironic_config/ini_setting_spec.rb +++ b/spec/unit/provider/ironic_config/openstackconfig_spec.rb @@ -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( File.join( File.dirname(__FILE__), @@ -20,19 +25,13 @@ $LOAD_PATH.push( 'openstacklib', 'lib') ) - require 'spec_helper' - -provider_class = Puppet::Type.type(:ironic_config).provider(:ini_setting) - +provider_class = Puppet::Type.type(:ironic_config).provider(:openstackconfig) describe provider_class do it 'should default to the default setting when no other one is specified' do resource = Puppet::Type::Ironic_config.new( - { - :name => 'DEFAULT/foo', - :value => 'bar' - } + {:name => 'DEFAULT/foo', :value => 'bar'} ) provider = provider_class.new(resource) expect(provider.section).to eq('DEFAULT') @@ -41,10 +40,7 @@ describe provider_class do it 'should allow setting to be set explicitly' do resource = Puppet::Type::Ironic_config.new( - { - :name => 'dude/foo', - :value => 'bar' - } + {:name => 'dude/foo', :value => 'bar'} ) provider = provider_class.new(resource) expect(provider.section).to eq('dude') @@ -68,4 +64,5 @@ describe provider_class do provider.exists? expect(resource[:ensure]).to eq :absent end + end diff --git a/spec/unit/type/ironic_config_spec.rb b/spec/unit/type/ironic_config_spec.rb index 7163d27e..51f54c9c 100644 --- a/spec/unit/type/ironic_config_spec.rb +++ b/spec/unit/type/ironic_config_spec.rb @@ -6,7 +6,7 @@ describe 'Puppet::Type.type(:ironic_config)' do @ironic_config = Puppet::Type.type(:ironic_config).new(:name => 'DEFAULT/foo', :value => 'bar') end - it 'should require a name' do + it 'should require a name' do expect { Puppet::Type.type(:ironic_config).new({}) }.to raise_error(Puppet::Error, 'Title or name must be provided') @@ -30,12 +30,12 @@ describe 'Puppet::Type.type(:ironic_config)' do it 'should accept a valid value' do @ironic_config[:value] = 'bar' - expect(@ironic_config[:value]).to eq('bar') + expect(@ironic_config[:value]).to eq(['bar']) end it 'should not accept a value with whitespace' do @ironic_config[:value] = 'b ar' - expect(@ironic_config[:value]).to eq('b ar') + expect(@ironic_config[:value]).to eq(['b ar']) end it 'should accept valid ensure values' do