Use anchor to require necessary packages/services
... so that correct packages and services are required without re-defining them in resource implementations. Change-Id: I756b6ff532cc1989ef9e24228d475d481c75c4a5
This commit is contained in:
parent
7a6e3e0338
commit
70bf352a34
|
@ -45,8 +45,8 @@ Puppet::Type.newtype(:sahara_api_paste_ini) do
|
|||
defaultto('<SERVICE DEFAULT>')
|
||||
end
|
||||
|
||||
autorequire(:package) do
|
||||
'sahara-common'
|
||||
autorequire(:anchor) do
|
||||
['sahara::install::end']
|
||||
end
|
||||
|
||||
end
|
||||
|
|
|
@ -47,8 +47,8 @@ Puppet::Type.newtype(:sahara_cluster_template) do
|
|||
end
|
||||
end
|
||||
|
||||
autorequire(:service) do
|
||||
[ 'sahara-api', 'sahara-engine' ]
|
||||
autorequire(:anchor) do
|
||||
['sahara::service::end']
|
||||
end
|
||||
|
||||
autorequire(:sahara_node_group_template) do
|
||||
|
|
|
@ -45,7 +45,7 @@ Puppet::Type.newtype(:sahara_config) do
|
|||
defaultto('<SERVICE DEFAULT>')
|
||||
end
|
||||
|
||||
autorequire(:package) do
|
||||
'sahara-common'
|
||||
autorequire(:anchor) do
|
||||
['sahara::install::end']
|
||||
end
|
||||
end
|
||||
|
|
|
@ -74,7 +74,7 @@ Puppet::Type.newtype(:sahara_node_group_template) do
|
|||
end
|
||||
end
|
||||
|
||||
autorequire(:service) do
|
||||
[ 'sahara-api', 'sahara-engine' ]
|
||||
autorequire(:anchor) do
|
||||
['sahara::service::end']
|
||||
end
|
||||
end
|
||||
|
|
|
@ -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/sahara_api_paste_ini'
|
||||
|
||||
describe 'Puppet::Type.type(:sahara_api_paste_ini)' do
|
||||
before :each do
|
||||
@sahara_api_paste_ini = Puppet::Type.type(:sahara_api_paste_ini).new(:name => 'DEFAULT/foo', :value => 'bar')
|
||||
end
|
||||
|
||||
it 'should accept a valid value' do
|
||||
@sahara_api_paste_ini[:value] = 'bar'
|
||||
expect(@sahara_api_paste_ini[:value]).to eq('bar')
|
||||
|
@ -23,12 +13,12 @@ describe 'Puppet::Type.type(:sahara_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 => 'sahara-common')
|
||||
catalog.add_resource package, @sahara_api_paste_ini
|
||||
anchor = Puppet::Type.type(:anchor).new(:name => 'sahara::install::end')
|
||||
catalog.add_resource anchor, @sahara_api_paste_ini
|
||||
dependency = @sahara_api_paste_ini.autorequire
|
||||
expect(dependency.size).to eq(1)
|
||||
expect(dependency[0].target).to eq(@sahara_api_paste_ini)
|
||||
expect(dependency[0].source).to eq(package)
|
||||
expect(dependency[0].source).to eq(anchor)
|
||||
end
|
||||
|
||||
end
|
||||
|
|
|
@ -33,17 +33,17 @@ describe Puppet::Type.type(:sahara_cluster_template) do
|
|||
|
||||
it 'should autorequire sahara-api service' do
|
||||
catalog = Puppet::Resource::Catalog.new
|
||||
service = Puppet::Type.type(:service).new(:name => 'sahara-api')
|
||||
anchor = Puppet::Type.type(:anchor).new(:name => 'sahara::service::end')
|
||||
correct_input = {
|
||||
:name => 'test_type',
|
||||
:node_groups => [ 'nodegroup_1:1', 'nodegroup_2:2' ]
|
||||
}
|
||||
sahara_cluster_template = Puppet::Type.type(:sahara_cluster_template).new(correct_input)
|
||||
catalog.add_resource service, sahara_cluster_template
|
||||
catalog.add_resource anchor, sahara_cluster_template
|
||||
dependency = sahara_cluster_template.autorequire
|
||||
expect(dependency.size).to eq(1)
|
||||
expect(dependency[0].target).to eq(sahara_cluster_template)
|
||||
expect(dependency[0].source).to eq(service)
|
||||
expect(dependency[0].source).to eq(anchor)
|
||||
end
|
||||
|
||||
it 'should autorequire sahara_node_group_template' do
|
||||
|
|
|
@ -1,5 +1,6 @@
|
|||
require 'puppet'
|
||||
require 'puppet/type/sahara_config'
|
||||
|
||||
describe 'Puppet::Type.type(:sahara_config)' do
|
||||
before :each do
|
||||
@sahara_config = Puppet::Type.type(:sahara_config).new(:name => 'DEFAULT/foo', :value => 'bar')
|
||||
|
@ -52,11 +53,11 @@ describe 'Puppet::Type.type(:sahara_config)' do
|
|||
|
||||
it 'should autorequire the package that install the file' do
|
||||
catalog = Puppet::Resource::Catalog.new
|
||||
package = Puppet::Type.type(:package).new(:name => 'sahara-common')
|
||||
catalog.add_resource package, @sahara_config
|
||||
anchor = Puppet::Type.type(:anchor).new(:name => 'sahara::install::end')
|
||||
catalog.add_resource anchor, @sahara_config
|
||||
dependency = @sahara_config.autorequire
|
||||
expect(dependency.size).to eq(1)
|
||||
expect(dependency[0].target).to eq(@sahara_config)
|
||||
expect(dependency[0].source).to eq(package)
|
||||
expect(dependency[0].source).to eq(anchor)
|
||||
end
|
||||
end
|
||||
|
|
|
@ -20,7 +20,7 @@ describe Puppet::Type.type(:sahara_node_group_template) do
|
|||
|
||||
it 'should autorequire cinder-api service' do
|
||||
catalog = Puppet::Resource::Catalog.new
|
||||
service = Puppet::Type.type(:service).new(:name => 'sahara-api')
|
||||
anchor = Puppet::Type.type(:anchor).new(:name => 'sahara::service::end')
|
||||
correct_input = {
|
||||
:name => 'test_type',
|
||||
:plugin => 'plugin',
|
||||
|
@ -29,10 +29,10 @@ describe Puppet::Type.type(:sahara_node_group_template) do
|
|||
:node_processes => [ 'process1', 'process2' ]
|
||||
}
|
||||
sahara_node_group_template = Puppet::Type.type(:sahara_node_group_template).new(correct_input)
|
||||
catalog.add_resource service, sahara_node_group_template
|
||||
catalog.add_resource anchor, sahara_node_group_template
|
||||
dependency = sahara_node_group_template.autorequire
|
||||
expect(dependency.size).to eq(1)
|
||||
expect(dependency[0].target).to eq(sahara_node_group_template)
|
||||
expect(dependency[0].source).to eq(service)
|
||||
expect(dependency[0].source).to eq(anchor)
|
||||
end
|
||||
end
|
||||
|
|
Loading…
Reference in New Issue