Browse Source

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
changes/02/800602/1
Takashi Kajinami 3 months ago
parent
commit
5c47db969b
  1. 4
      lib/puppet/provider/designate_config/openstackconfig.rb
  2. 12
      lib/puppet/type/designate_config.rb
  3. 13
      spec/unit/provider/designate_config/openstackconfig_spec.rb
  4. 4
      spec/unit/type/designate_config_spec.rb

4
lib/puppet/provider/designate_config/ini_setting.rb → lib/puppet/provider/designate_config/openstackconfig.rb

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

12
lib/puppet/type/designate_config.rb

@ -7,14 +7,22 @@ Puppet::Type.newtype(:designate_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?

13
spec/unit/provider/designate_config/ini_setting_spec.rb → spec/unit/provider/designate_config/openstackconfig_spec.rb

@ -2,7 +2,7 @@
# 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 programatcally set the modulepath
# I could not, for the life of me, figure out how to programmatically set the modulepath
$LOAD_PATH.push(
File.join(
File.dirname(__FILE__),
@ -26,12 +26,12 @@ $LOAD_PATH.push(
'lib')
)
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
it 'should default to the default setting when no other one is specified' do
resource = Puppet::Type::Designate_config.new(
{:name => 'DEFAULT/foo', :value => 'plop'}
{:name => 'DEFAULT/foo', :value => 'bar'}
)
provider = provider_class.new(resource)
expect(provider.section).to eq('DEFAULT')
@ -40,11 +40,11 @@ describe provider_class do
it 'should allow setting to be set explicitly' do
resource = Puppet::Type::Designate_config.new(
{:name => 'boo/zoo', :value => 'plop'}
{:name => 'dude/foo', :value => 'bar'}
)
provider = provider_class.new(resource)
expect(provider.section).to eq('boo')
expect(provider.setting).to eq('zoo')
expect(provider.section).to eq('dude')
expect(provider.setting).to eq('foo')
end
it 'should ensure absent when <SERVICE DEFAULT> is specified as a value' do
@ -64,4 +64,5 @@ describe provider_class do
provider.exists?
expect(resource[:ensure]).to eq :absent
end
end

4
spec/unit/type/designate_config_spec.rb

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

Loading…
Cancel
Save