Use anchor to require necessary packages

... so that correct packages are required without re-defining them in
resource implementations.

Change-Id: I274e2aa28648f1c875d1f43b26a2afc1e65ee3bc
This commit is contained in:
Takashi Kajinami 2020-05-04 01:53:07 +09:00
parent b1ea700ba8
commit 2e1a3d0647
6 changed files with 18 additions and 28 deletions

View File

@ -45,8 +45,8 @@ Puppet::Type.newtype(:ironic_api_paste_ini) do
defaultto('<SERVICE DEFAULT>') defaultto('<SERVICE DEFAULT>')
end end
autorequire(:package) do autorequire(:anchor) do
'ironic' ['ironic::install::end']
end end
end end

View File

@ -48,8 +48,8 @@ Puppet::Type.newtype(:ironic_config) do
newparam(:transform_to) newparam(:transform_to)
autorequire(:package) do autorequire(:anchor) do
'ironic-common' ['ironic::install::end']
end end
end end

View File

@ -46,8 +46,8 @@ Puppet::Type.newtype(:ironic_inspector_config) do
defaultto('<SERVICE DEFAULT>') defaultto('<SERVICE DEFAULT>')
end end
autorequire(:package) do autorequire(:anchor) do
'ironic-inspector' ['ironic::install::end']
end end
end end

View File

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

View File

@ -53,12 +53,12 @@ describe 'Puppet::Type.type(:ironic_config)' do
it 'should autorequire the package that install the file' do it 'should autorequire the package that install the file' do
catalog = Puppet::Resource::Catalog.new catalog = Puppet::Resource::Catalog.new
package = Puppet::Type.type(:package).new(:name => 'ironic-common') anchor = Puppet::Type.type(:anchor).new(:name => 'ironic::install::end')
catalog.add_resource package, @ironic_config catalog.add_resource anchor, @ironic_config
dependency = @ironic_config.autorequire dependency = @ironic_config.autorequire
expect(dependency.size).to eq(1) expect(dependency.size).to eq(1)
expect(dependency[0].target).to eq(@ironic_config) expect(dependency[0].target).to eq(@ironic_config)
expect(dependency[0].source).to eq(package) expect(dependency[0].source).to eq(anchor)
end end
end end

View File

@ -8,12 +8,12 @@ describe 'Puppet::Type.type(:ironic_inspector_config)' do
it 'should autorequire the package that install the file' do it 'should autorequire the package that install the file' do
catalog = Puppet::Resource::Catalog.new catalog = Puppet::Resource::Catalog.new
package = Puppet::Type.type(:package).new(:name => 'ironic-inspector') anchor = Puppet::Type.type(:anchor).new(:name => 'ironic::install::end')
catalog.add_resource package, @ironic_inspector_config catalog.add_resource anchor, @ironic_inspector_config
dependency = @ironic_inspector_config.autorequire dependency = @ironic_inspector_config.autorequire
expect(dependency.size).to eq(1) expect(dependency.size).to eq(1)
expect(dependency[0].target).to eq(@ironic_inspector_config) expect(dependency[0].target).to eq(@ironic_inspector_config)
expect(dependency[0].source).to eq(package) expect(dependency[0].source).to eq(anchor)
end end
end end