Reflect provider change in puppet-openstacklib
With the creation of the new openstack_config provider, some processing that was done in ceilometer_config has been centralized in openstack_config. Impacted methods are : * section * setting * separator Also, this commit adds the fact that, when passing a specific string (ensure_absent_val) the provider will behave as if ensure => absent was specified. '<SERVICE DEFAULT>' is the default value for ensure_absent_val. The use case is the following : ceilometer_config { 'DEFAULT/foo' : value => 'bar' } # will work as usual ceilometer_config { 'DEFAULT/foo' : value => '<SERVICE DEFAULT>' } # will mean absent That means that all the current : if $myvar { ceilometer_config { 'DEFAULT/foo' : value => $myvar } } else { ceilometer_config { 'DEFAULT/foo' : ensure => absent } } can be removed in favor of : ceilometer_config { 'DEFAULT/foo' : value => $myvar } If for any reason '<SERVICE DEFAULT>' turns out to be a valid value for a specific parameter. One could by pass that doing the following : ceilometer_config { 'DEFAULT/foo' : value => '<SERVICE DEFAULT>', ensure_absent_val => 'foo' } Change-Id: Ia46f8ea1228caca85d6fe431922fa8229f4c4ade Depends-On: I0eeebde3aac2662cc7e69bfad7f8d2481463a218
This commit is contained in:
parent
212630d4f2
commit
05c5ec1605
30
README.md
30
README.md
@ -77,6 +77,36 @@ Implementation
|
|||||||
ceilometer is a combination of Puppet manifests and Ruby code to deliver configuration and
|
ceilometer is a combination of Puppet manifests and Ruby code to deliver configuration and
|
||||||
extra functionality through types and providers.
|
extra functionality through types and providers.
|
||||||
|
|
||||||
|
### Types
|
||||||
|
|
||||||
|
#### ceilometer_config
|
||||||
|
|
||||||
|
The `ceilometer_config` provider is a children of the ini_setting provider. It allows one to write an entry in the `/etc/ceilometer/ceilometer.conf` file.
|
||||||
|
|
||||||
|
```puppet
|
||||||
|
ceilometer_config { 'DEFAULT/verbose' :
|
||||||
|
value => true,
|
||||||
|
}
|
||||||
|
```
|
||||||
|
|
||||||
|
This will write `verbose=true` in the `[DEFAULT]` section.
|
||||||
|
|
||||||
|
##### name
|
||||||
|
|
||||||
|
Section/setting name to manage from `ceilometer.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 `<SERVICE DEFAULT>`
|
||||||
|
|
||||||
Limitations
|
Limitations
|
||||||
-----------
|
-----------
|
||||||
|
|
||||||
|
@ -1,20 +1,8 @@
|
|||||||
Puppet::Type.type(:ceilometer_config).provide(
|
Puppet::Type.type(:ceilometer_config).provide(
|
||||||
:ini_setting,
|
:ini_setting,
|
||||||
:parent => Puppet::Type.type(:ini_setting).provider(:ruby)
|
:parent => Puppet::Type.type(:openstack_config).provider(:ini_setting)
|
||||||
) do
|
) do
|
||||||
|
|
||||||
def section
|
|
||||||
resource[:name].split('/', 2).first
|
|
||||||
end
|
|
||||||
|
|
||||||
def setting
|
|
||||||
resource[:name].split('/', 2).last
|
|
||||||
end
|
|
||||||
|
|
||||||
def separator
|
|
||||||
'='
|
|
||||||
end
|
|
||||||
|
|
||||||
def self.file_path
|
def self.file_path
|
||||||
'/etc/ceilometer/ceilometer.conf'
|
'/etc/ceilometer/ceilometer.conf'
|
||||||
end
|
end
|
||||||
|
@ -41,6 +41,11 @@ Puppet::Type.newtype(:ceilometer_config) do
|
|||||||
defaultto false
|
defaultto false
|
||||||
end
|
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('<SERVICE DEFAULT>')
|
||||||
|
end
|
||||||
|
|
||||||
autorequire(:package) do
|
autorequire(:package) do
|
||||||
'ceilometer-common'
|
'ceilometer-common'
|
||||||
end
|
end
|
||||||
|
@ -9,6 +9,17 @@ $LOAD_PATH.push(
|
|||||||
'inifile',
|
'inifile',
|
||||||
'lib')
|
'lib')
|
||||||
)
|
)
|
||||||
|
$LOAD_PATH.push(
|
||||||
|
File.join(
|
||||||
|
File.dirname(__FILE__),
|
||||||
|
'..',
|
||||||
|
'..',
|
||||||
|
'..',
|
||||||
|
'fixtures',
|
||||||
|
'modules',
|
||||||
|
'openstacklib',
|
||||||
|
'lib')
|
||||||
|
)
|
||||||
|
|
||||||
require 'spec_helper'
|
require 'spec_helper'
|
||||||
|
|
||||||
@ -39,4 +50,23 @@ describe provider_class do
|
|||||||
expect(provider.section).to eq('dude')
|
expect(provider.section).to eq('dude')
|
||||||
expect(provider.setting).to eq('foo')
|
expect(provider.setting).to eq('foo')
|
||||||
end
|
end
|
||||||
|
|
||||||
|
it 'should ensure absent when <SERVICE DEFAULT> is specified as a value' do
|
||||||
|
resource = Puppet::Type::Ceilometer_config.new(
|
||||||
|
{:name => 'dude/foo', :value => '<SERVICE DEFAULT>'}
|
||||||
|
)
|
||||||
|
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::Ceilometer_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
|
end
|
||||||
|
Loading…
x
Reference in New Issue
Block a user