Use anchor to require necessary packages

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

Change-Id: Ic3ff8a7555d1fadc9ecb01c00d9dd3b6eb7f5e4b
This commit is contained in:
Takashi Kajinami 2020-05-04 14:54:07 +09:00
parent 5744b9992d
commit 345638b937
4 changed files with 13 additions and 23 deletions

View File

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

View File

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

View File

@ -1,21 +1,11 @@
require 'spec_helper'
# 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'
require 'puppet/type/cloudkitty_api_paste_ini'
describe 'Puppet::Type.type(:cloudkitty_api_paste_ini)' do
before :each do
@cloudkitty_api_paste_ini = Puppet::Type.type(:cloudkitty_api_paste_ini).new(:name => 'DEFAULT/foo', :value => 'bar')
end
it 'should accept a valid value' do
@cloudkitty_api_paste_ini[:value] = 'bar'
expect(@cloudkitty_api_paste_ini[:value]).to eq('bar')
@ -23,12 +13,12 @@ describe 'Puppet::Type.type(:cloudkitty_api_paste_ini)' do
it 'should autorequire the package that install the file' do
catalog = Puppet::Resource::Catalog.new
package = Puppet::Type.type(:package).new(:name => 'cloudkitty-common')
catalog.add_resource package, @cloudkitty_api_paste_ini
anchor = Puppet::Type.type(:anchor).new(:name => 'cloudkitty::install::end')
catalog.add_resource anchor, @cloudkitty_api_paste_ini
dependency = @cloudkitty_api_paste_ini.autorequire
expect(dependency.size).to eq(1)
expect(dependency[0].target).to eq(@cloudkitty_api_paste_ini)
expect(dependency[0].source).to eq(package)
expect(dependency[0].source).to eq(anchor)
end
end

View File

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