diff --git a/README.md b/README.md index 5a00b70b..00ac0ed8 100644 --- a/README.md +++ b/README.md @@ -34,6 +34,36 @@ Implementation gnocchi is a combination of Puppet manifest and ruby code to delivery configuration and extra functionality through types and providers. +### Types + +#### gnocchi_config + +The `gnocchi_config` provider is a children of the ini_setting provider. It allows one to write an entry in the `/etc/gnocchi/gnocchi.conf` file. + +```puppet +gnocchi_config { 'DEFAULT/verbose' : + value => true, +} +``` + +This will write `verbose=true` in the `[DEFAULT]` section. + +##### name + +Section/setting name to manage from `gnocchi.conf` + +##### value + +The value of the setting to be defined. + +##### secret + +Whether to hide the value from Puppet logs. Defaults to `false`. + +##### ensure_absent_val + +If value is equal to ensure_absent_val then the resource will behave as if `ensure => absent` was specified. Defaults to `` + Limitations ----------- diff --git a/lib/puppet/provider/gnocchi_config/ini_setting.rb b/lib/puppet/provider/gnocchi_config/ini_setting.rb index 0fee4b12..e4f5888a 100644 --- a/lib/puppet/provider/gnocchi_config/ini_setting.rb +++ b/lib/puppet/provider/gnocchi_config/ini_setting.rb @@ -1,27 +1,10 @@ Puppet::Type.type(:gnocchi_config).provide( :ini_setting, - :parent => Puppet::Type.type(:ini_setting).provider(:ruby) + :parent => Puppet::Type.type(:openstack_config).provider(:ini_setting) ) do - def section - resource[:name].split('/', 2).first - end - - def setting - resource[:name].split('/', 2).last - end - - def separator - '=' - end - def self.file_path '/etc/gnocchi/gnocchi.conf' end - # added for backwards compatibility with older versions of inifile - def file_path - self.class.file_path - end - end diff --git a/lib/puppet/type/gnocchi_config.rb b/lib/puppet/type/gnocchi_config.rb index acdb0e76..7c32cf25 100644 --- a/lib/puppet/type/gnocchi_config.rb +++ b/lib/puppet/type/gnocchi_config.rb @@ -14,6 +14,7 @@ Puppet::Type.newtype(:gnocchi_config) do value.capitalize! if value =~ /^(true|false)$/i value end + newvalues(/^[\S ]*$/) def is_to_s( currentvalue ) if resource.secret? @@ -40,6 +41,11 @@ Puppet::Type.newtype(:gnocchi_config) do defaultto false end + newparam(:ensure_absent_val) do + desc 'A value that is specified as the value property will behave as if ensure => absent was specified' + defaultto('') + end + autorequire(:package) do 'gnocchi-api' end diff --git a/spec/unit/provider/gnocchi_config/ini_setting_spec.rb b/spec/unit/provider/gnocchi_config/ini_setting_spec.rb index 059a5a2f..a3fbe1cb 100644 --- a/spec/unit/provider/gnocchi_config/ini_setting_spec.rb +++ b/spec/unit/provider/gnocchi_config/ini_setting_spec.rb @@ -13,6 +13,17 @@ $LOAD_PATH.push( 'inifile', 'lib') ) +$LOAD_PATH.push( + File.join( + File.dirname(__FILE__), + '..', + '..', + '..', + 'fixtures', + 'modules', + 'openstacklib', + 'lib') +) require 'spec_helper' provider_class = Puppet::Type.type(:gnocchi_config).provider(:ini_setting) describe provider_class do @@ -34,4 +45,22 @@ describe provider_class do expect(provider.section).to eq('dude') expect(provider.setting).to eq('foo') end + + it 'should ensure absent when is specified as a value' do + resource = Puppet::Type::Gnocchi_config.new( + {:name => 'dude/foo', :value => ''} + ) + provider = provider_class.new(resource) + provider.exists? + expect(resource[:ensure]).to eq :absent + end + + it 'should ensure absent when value matches ensure_absent_val' do + resource = Puppet::Type::Gnocchi_config.new( + {:name => 'dude/foo', :value => 'foo', :ensure_absent_val => 'foo' } + ) + provider = provider_class.new(resource) + provider.exists? + expect(resource[:ensure]).to eq :absent + end end