e956eba829
With the creation of the new openstack_config provider, some processing that was done in neutron_config has been centralized in openstack_config. The same logic applies for all the neutron resources that edit a ini-like configuration file. 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 : neutron_config { 'DEFAULT/foo' : value => 'bar' } # will work as usual neutron_config { 'DEFAULT/foo' : value => '<SERVICE DEFAULT>' } # will mean absent That means that all the current : if $myvar { neutron_config { 'DEFAULT/foo' : value => $myvar } } else { neutron_config { 'DEFAULT/foo' : ensure => absent } } can be removed in favor of : neutron_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 : neutron_config { 'DEFAULT/foo' : value => '<SERVICE DEFAULT>', ensure_absent_val => 'foo' } Change-Id: I3f972ecbde3719fe71a82a64f894d41f6ea7e842 Depends-On: I0eeebde3aac2662cc7e69bfad7f8d2481463a218
75 lines
1.8 KiB
Ruby
75 lines
1.8 KiB
Ruby
$LOAD_PATH.push(
|
|
File.join(
|
|
File.dirname(__FILE__),
|
|
'..',
|
|
'..',
|
|
'..',
|
|
'fixtures',
|
|
'modules',
|
|
'inifile',
|
|
'lib')
|
|
)
|
|
$LOAD_PATH.push(
|
|
File.join(
|
|
File.dirname(__FILE__),
|
|
'..',
|
|
'..',
|
|
'..',
|
|
'fixtures',
|
|
'modules',
|
|
'openstacklib',
|
|
'lib')
|
|
)
|
|
|
|
require 'spec_helper'
|
|
|
|
provider_class = Puppet::Type.type(:neutron_plugin_nvp).provider(:ini_setting)
|
|
|
|
describe provider_class do
|
|
|
|
it 'should default to the default setting when no other one is specified' do
|
|
resource = Puppet::Type::Neutron_plugin_nvp.new(
|
|
{
|
|
:name => 'DEFAULT/foo',
|
|
:value => 'bar'
|
|
}
|
|
)
|
|
provider = provider_class.new(resource)
|
|
expect(provider.section).to eq('DEFAULT')
|
|
expect(provider.setting).to eq('foo')
|
|
expect(provider.file_path).to eq('/etc/neutron/plugins/nicira/nvp.ini')
|
|
end
|
|
|
|
it 'should allow setting to be set explicitly' do
|
|
resource = Puppet::Type::Neutron_plugin_nvp.new(
|
|
{
|
|
:name => 'dude/foo',
|
|
:value => 'bar'
|
|
}
|
|
)
|
|
provider = provider_class.new(resource)
|
|
expect(provider.section).to eq('dude')
|
|
expect(provider.setting).to eq('foo')
|
|
expect(provider.file_path).to eq('/etc/neutron/plugins/nicira/nvp.ini')
|
|
end
|
|
|
|
it 'should ensure absent when <SERVICE DEFAULT> is specified as a value' do
|
|
resource = Puppet::Type::Neutron_plugin_nvp.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::Neutron_plugin_nvp.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
|