Add api_paste type/provider for Ironic

Add ironic_api_paste_ini type/provider for Ironic.
Also add the capability to configure api-paste.ini with config.pp.
Closes-bug: #1483371

Change-Id: I0a5ba71e577b87ad469fd624a73033a1a8ea6b82
This commit is contained in:
ZhongShengping 2016-02-05 12:36:01 +08:00
parent 375c81681f
commit a70ee4fb7e
6 changed files with 159 additions and 0 deletions

View File

@ -0,0 +1,27 @@
Puppet::Type.type(:ironic_api_paste_ini).provide(
:ini_setting,
:parent => Puppet::Type.type(:ini_setting).provider(:ruby)
) 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/ironic/api-paste.ini'
end
# added for backwards compatibility with older versions of inifile
def file_path
self.class.file_path
end
end

View File

@ -0,0 +1,52 @@
Puppet::Type.newtype(:ironic_api_paste_ini) do
ensurable
newparam(:name, :namevar => true) do
desc 'Section/setting name to manage from /etc/ironic/api-paste.ini'
newvalues(/\S+\/\S+/)
end
newproperty(:value) do
desc 'The value of the setting to be defined.'
munge do |value|
value = value.to_s.strip
value.capitalize! if value =~ /^(true|false)$/i
value
end
def is_to_s( currentvalue )
if resource.secret?
return '[old secret redacted]'
else
return currentvalue
end
end
def should_to_s( newvalue )
if resource.secret?
return '[new secret redacted]'
else
return newvalue
end
end
end
newparam(:secret, :boolean => true) do
desc 'Whether to hide the value from Puppet logs. Defaults to `false`.'
newvalues(:true, :false)
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('<SERVICE DEFAULT>')
end
autorequire(:package) do
'ironic'
end
end

View File

@ -17,14 +17,20 @@
# DEFAULT/bar:
# value: barValue
#
# [*ironic_api_paste_ini*]
# (optional) Allow configuration of /etc/ironic/api-paste.ini options.
#
# NOTE: The configuration MUST NOT be already handled by this module
# or Puppet catalog compilation will fail with duplicate resources.
#
class ironic::config (
$ironic_config = {},
$ironic_api_paste_ini = {},
) {
validate_hash($ironic_config)
validate_hash($ironic_api_paste_ini)
create_resources('ironic_config', $ironic_config)
create_resources('ironic_api_paste_ini', $ironic_api_paste_ini)
}

View File

@ -7,6 +7,11 @@ describe 'ironic::config' do
'DEFAULT/foo' => { 'value' => 'fooValue' },
'DEFAULT/bar' => { 'value' => 'barValue' },
'DEFAULT/baz' => { 'ensure' => 'absent' }
},
:ironic_api_paste_ini => {
'DEFAULT/foo2' => { 'value' => 'fooValue' },
'DEFAULT/bar2' => { 'value' => 'barValue' },
'DEFAULT/baz2' => { 'ensure' => 'absent' }
}
}
end
@ -17,4 +22,10 @@ describe 'ironic::config' do
is_expected.to contain_ironic_config('DEFAULT/baz').with_ensure('absent')
end
it 'configures arbitrary ironic-api-paste configurations' do
is_expected.to contain_ironic_api_paste_ini('DEFAULT/foo2').with_value('fooValue')
is_expected.to contain_ironic_api_paste_ini('DEFAULT/bar2').with_value('barValue')
is_expected.to contain_ironic_api_paste_ini('DEFAULT/baz2').with_ensure('absent')
end
end

View File

@ -0,0 +1,29 @@
#
# 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
$LOAD_PATH.push(
File.join(
File.dirname(__FILE__),
'..',
'..',
'..',
'fixtures',
'modules',
'inifile',
'lib')
)
require 'spec_helper'
provider_class = Puppet::Type.type(:ironic_api_paste_ini).provider(:ini_setting)
describe provider_class do
it 'should allow setting to be set explicitly' do
resource = Puppet::Type::Ironic_api_paste_ini.new(
{:name => 'dude/foo', :value => 'bar'}
)
provider = provider_class.new(resource)
expect(provider.section).to eq('dude')
expect(provider.setting).to eq('foo')
end
end

View File

@ -0,0 +1,34 @@
require 'spec_helper'
# this hack is required for now to ensure that the path is set up correctly
# to retrive the parent provider
$LOAD_PATH.push(
File.join(
File.dirname(__FILE__),
'..',
'..',
'fixtures',
'modules',
'inifile',
'lib')
)
require 'puppet/type/ironic_api_paste_ini'
describe 'Puppet::Type.type(:ironic_api_paste_ini)' do
before :each do
@ironic_api_paste_ini = Puppet::Type.type(:ironic_api_paste_ini).new(:name => 'DEFAULT/foo', :value => 'bar')
end
it 'should accept a valid value' do
@ironic_api_paste_ini[:value] = 'bar'
expect(@ironic_api_paste_ini[:value]).to eq('bar')
end
it 'should autorequire the package that install the file' do
catalog = Puppet::Resource::Catalog.new
package = Puppet::Type.type(:package).new(:name => 'ironic')
catalog.add_resource package, @ironic_api_paste_ini
dependency = @ironic_api_paste_ini.autorequire
expect(dependency.size).to eq(1)
expect(dependency[0].target).to eq(@ironic_api_paste_ini)
expect(dependency[0].source).to eq(package)
end
end