openstack
/
puppet-glance
Code Issues Proposed changes

Use anchor to require necessary packages/services 

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

Change-Id: I03016890692b406ca86750d7ec8b3b3e1d276b1a
This commit is contained in:
Takashi Kajinami 2020-05-04 01:40:47 +09:00
parent 56fd00fe5a
commit 10a9cbe4d7
15 changed files with 112 additions and 341 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/puppet/type/glance_api_config.rb
View File

@ -46,12 +46,8 @@ Puppet::Type.newtype(:glance_api_config) do
defaultto('<SERVICE DEFAULT>')
end
autorequire(:package) do
if Facter.value(:osfamily) == 'Debian'
'glance-api'
elsif Facter.value(:osfamily) == 'RedHat'
'openstack-glance'
end
autorequire(:anchor) do
['glance::install::end']
end
end

8
lib/puppet/type/glance_api_paste_ini.rb
View File

@ -45,12 +45,8 @@ Puppet::Type.newtype(:glance_api_paste_ini) do
defaultto('<SERVICE DEFAULT>')
end
autorequire(:package) do
if Facter.value(:osfamily) == 'Debian'
'glance-api'
elsif Facter.value(:osfamily) == 'RedHat'
'openstack-glance'
end
autorequire(:anchor) do
['glance::install::end']
end
end

8
lib/puppet/type/glance_cache_config.rb
View File

@ -46,12 +46,8 @@ Puppet::Type.newtype(:glance_cache_config) do
defaultto('<SERVICE DEFAULT>')
end
autorequire(:package) do
if Facter.value(:osfamily) == 'Debian'
'glance-api'
elsif Facter.value(:osfamily) == 'RedHat'
'openstack-glance'
end
autorequire(:anchor) do
['glance::install::end']
end
end

4
lib/puppet/type/glance_image.rb
View File

@ -114,8 +114,8 @@ Puppet::Type.newtype(:glance_image) do
end
# Require the Glance service to be running
autorequire(:service) do
['glance-api', 'glance-registry']
autorequire(:anchor) do
['glance::service::end']
end
end

8
lib/puppet/type/glance_image_import_config.rb
View File

@ -46,12 +46,8 @@ Puppet::Type.newtype(:glance_image_import_config) do
defaultto('<SERVICE DEFAULT>')
end
autorequire(:package) do
if Facter.value(:osfamily) == 'Debian'
'glance-api'
elsif Facter.value(:osfamily) == 'RedHat'
'openstack-glance'
end
autorequire(:anchor) do
['glance::install::end']
end
end

8
lib/puppet/type/glance_registry_config.rb
View File

@ -46,12 +46,8 @@ Puppet::Type.newtype(:glance_registry_config) do
defaultto('<SERVICE DEFAULT>')
end
autorequire(:package) do
if Facter.value(:osfamily) == 'Debian'
'glance-registry'
elsif Facter.value(:osfamily) == 'RedHat'
'openstack-glance'
end
autorequire(:anchor) do
['glance::install::end']
end
end

8
lib/puppet/type/glance_registry_paste_ini.rb
View File

@ -45,12 +45,8 @@ Puppet::Type.newtype(:glance_registry_paste_ini) do
defaultto('<SERVICE DEFAULT>')
end
autorequire(:package) do
if Facter.value(:osfamily) == 'Debian'
'glance-registry'
elsif Facter.value(:osfamily) == 'RedHat'
'openstack-glance'
end
autorequire(:anchor) do
['glance::install::end']
end
end

8
lib/puppet/type/glance_swift_config.rb
View File

@ -46,12 +46,8 @@ Puppet::Type.newtype(:glance_swift_config) do
defaultto('<SERVICE DEFAULT>')
end
autorequire(:package) do
if Facter.value(:osfamily) == 'Debian'
'glance-api'
elsif Facter.value(:osfamily) == 'RedHat'
'openstack-glance'
end
autorequire(:anchor) do
['glance::install::end']
end
end

38
spec/unit/type/glance_api_config_spec.rb
View File

@ -3,39 +3,17 @@ require 'puppet/type/glance_api_config'
describe 'Puppet::Type.type(:glance_api_config)' do
before :each do
Puppet::Type.rmtype(:glance_api_config)
Facter.fact(:osfamily).stubs(:value).returns(platform_params[:osfamily])
@glance_api_config = Puppet::Type.type(:glance_api_config).new(:name => 'DEFAULT/foo', :value => 'bar')
end
shared_examples_for 'glance_api_config' do
it 'should autorequire the package that install the file' do
catalog = Puppet::Resource::Catalog.new
package = Puppet::Type.type(:package).new(:name => platform_params[:package_name])
catalog.add_resource package, @glance_api_config
dependency = @glance_api_config.autorequire
expect(dependency.size).to eq(1)
expect(dependency[0].target).to eq(@glance_api_config)
expect(dependency[0].source).to eq(package)
end
end
context 'on Debian platforms' do
let :platform_params do
{ :package_name => 'glance-api',
:osfamily => 'Debian' }
end
it_behaves_like 'glance_api_config'
end
context 'on RedHat platforms' do
let :platform_params do
{ :package_name => 'openstack-glance',
:osfamily => 'RedHat'}
end
it_behaves_like 'glance_api_config'
it 'should autorequire the package that install the file' do
catalog = Puppet::Resource::Catalog.new
anchor = Puppet::Type.type(:anchor).new(:name => 'glance::install::end')
catalog.add_resource anchor, @glance_api_config
dependency = @glance_api_config.autorequire
expect(dependency.size).to eq(1)
expect(dependency[0].target).to eq(@glance_api_config)
expect(dependency[0].source).to eq(anchor)
end
end

119
spec/unit/type/glance_api_paste_ini_spec.rb
View File

@ -3,85 +3,62 @@ require 'puppet/type/glance_api_paste_ini'
describe 'Puppet::Type.type(:glance_api_paste_ini)' do
before :each do
Puppet::Type.rmtype(:glance_api_paste_ini)
Facter.fact(:osfamily).stubs(:value).returns(platform_params[:osfamily])
@glance_api_paste_ini = Puppet::Type.type(:glance_api_paste_ini).new(:name => 'DEFAULT/foo', :value => 'bar')
end
shared_examples_for 'glance_api_paste_ini' do
it 'should require a name' do
expect {
Puppet::Type.type(:glance_api_paste_ini).new({})
}.to raise_error(Puppet::Error, 'Title or name must be provided')
end
it 'should not expect a name with whitespace' do
expect {
Puppet::Type.type(:glance_api_paste_ini).new(:name => 'f oo')
}.to raise_error(Puppet::Error, /Parameter name failed/)
end
it 'should fail when there is no section' do
expect {
Puppet::Type.type(:glance_api_paste_ini).new(:name => 'foo')
}.to raise_error(Puppet::Error, /Parameter name failed/)
end
it 'should not require a value when ensure is absent' do
Puppet::Type.type(:glance_api_paste_ini).new(:name => 'DEFAULT/foo', :ensure => :absent)
end
it 'should accept a valid value' do
@glance_api_paste_ini[:value] = 'bar'
expect(@glance_api_paste_ini[:value]).to eq('bar')
end
it 'should not accept a value with whitespace' do
@glance_api_paste_ini[:value] = 'b ar'
expect(@glance_api_paste_ini[:value]).to eq('b ar')
end
it 'should accept valid ensure values' do
@glance_api_paste_ini[:ensure] = :present
expect(@glance_api_paste_ini[:ensure]).to eq(:present)
@glance_api_paste_ini[:ensure] = :absent
expect(@glance_api_paste_ini[:ensure]).to eq(:absent)
end
it 'should not accept invalid ensure values' do
expect {
@glance_api_paste_ini[:ensure] = :latest
}.to raise_error(Puppet::Error, /Invalid value/)
end
it 'should autorequire the package that install the file' do
catalog = Puppet::Resource::Catalog.new
package = Puppet::Type.type(:package).new(:name => platform_params[:package_name])
catalog.add_resource package, @glance_api_paste_ini
dependency = @glance_api_paste_ini.autorequire
expect(dependency.size).to eq(1)
expect(dependency[0].target).to eq(@glance_api_paste_ini)
expect(dependency[0].source).to eq(package)
end
it 'should require a name' do
expect {
Puppet::Type.type(:glance_api_paste_ini).new({})
}.to raise_error(Puppet::Error, 'Title or name must be provided')
end
context 'on Debian platforms' do
let :platform_params do
{ :package_name => 'glance-api',
:osfamily => 'Debian' }
end
it_behaves_like 'glance_api_paste_ini'
it 'should not expect a name with whitespace' do
expect {
Puppet::Type.type(:glance_api_paste_ini).new(:name => 'f oo')
}.to raise_error(Puppet::Error, /Parameter name failed/)
end
context 'on RedHat platforms' do
let :platform_params do
{ :package_name => 'openstack-glance',
:osfamily => 'RedHat'}
end
it 'should fail when there is no section' do
expect {
Puppet::Type.type(:glance_api_paste_ini).new(:name => 'foo')
}.to raise_error(Puppet::Error, /Parameter name failed/)
end
it_behaves_like 'glance_api_paste_ini'
it 'should not require a value when ensure is absent' do
Puppet::Type.type(:glance_api_paste_ini).new(:name => 'DEFAULT/foo', :ensure => :absent)
end
it 'should accept a valid value' do
@glance_api_paste_ini[:value] = 'bar'
expect(@glance_api_paste_ini[:value]).to eq('bar')
end
it 'should not accept a value with whitespace' do
@glance_api_paste_ini[:value] = 'b ar'
expect(@glance_api_paste_ini[:value]).to eq('b ar')
end
it 'should accept valid ensure values' do
@glance_api_paste_ini[:ensure] = :present
expect(@glance_api_paste_ini[:ensure]).to eq(:present)
@glance_api_paste_ini[:ensure] = :absent
expect(@glance_api_paste_ini[:ensure]).to eq(:absent)
end
it 'should not accept invalid ensure values' do
expect {
@glance_api_paste_ini[:ensure] = :latest
}.to raise_error(Puppet::Error, /Invalid value/)
end
it 'should autorequire the package that install the file' do
catalog = Puppet::Resource::Catalog.new
anchor = Puppet::Type.type(:anchor).new(:name => 'glance::install::end')
catalog.add_resource anchor, @glance_api_paste_ini
dependency = @glance_api_paste_ini.autorequire
expect(dependency.size).to eq(1)
expect(dependency[0].target).to eq(@glance_api_paste_ini)
expect(dependency[0].source).to eq(anchor)
end
end

38
spec/unit/type/glance_cache_config_spec.rb
View File

@ -3,39 +3,17 @@ require 'puppet/type/glance_cache_config'
describe 'Puppet::Type.type(:glance_cache_config)' do
before :each do
Puppet::Type.rmtype(:glance_cache_config)
Facter.fact(:osfamily).stubs(:value).returns(platform_params[:osfamily])
@glance_cache_config = Puppet::Type.type(:glance_cache_config).new(:name => 'DEFAULT/foo', :value => 'bar')
end
shared_examples_for 'glance_cache_config' do
it 'should autorequire the package that install the file' do
catalog = Puppet::Resource::Catalog.new
package = Puppet::Type.type(:package).new(:name => platform_params[:package_name])
catalog.add_resource package, @glance_cache_config
dependency = @glance_cache_config.autorequire
expect(dependency.size).to eq(1)
expect(dependency[0].target).to eq(@glance_cache_config)
expect(dependency[0].source).to eq(package)
end
end
context 'on Debian platforms' do
let :platform_params do
{ :package_name => 'glance-api',
:osfamily => 'Debian' }
end
it_behaves_like 'glance_cache_config'
end
context 'on RedHat platforms' do
let :platform_params do
{ :package_name => 'openstack-glance',
:osfamily => 'RedHat'}
end
it_behaves_like 'glance_cache_config'
it 'should autorequire the package that install the file' do
catalog = Puppet::Resource::Catalog.new
anchor = Puppet::Type.type(:anchor).new(:name => 'glance::install::end')
catalog.add_resource anchor, @glance_cache_config
dependency = @glance_cache_config.autorequire
expect(dependency.size).to eq(1)
expect(dependency[0].target).to eq(@glance_cache_config)
expect(dependency[0].source).to eq(anchor)
end
end

38
spec/unit/type/glance_image_import_config_spec.rb
View File

@ -3,39 +3,17 @@ require 'puppet/type/glance_image_import_config'
describe 'Puppet::Type.type(:glance_image_import_config)' do
before :each do
Puppet::Type.rmtype(:glance_image_import_config)
Facter.fact(:osfamily).stubs(:value).returns(platform_params[:osfamily])
@glance_image_import_config = Puppet::Type.type(:glance_image_import_config).new(:name => 'DEFAULT/foo', :value => 'bar')
end
shared_examples_for 'glance_image_import_config' do
it 'should autorequire the package that install the file' do
catalog = Puppet::Resource::Catalog.new
package = Puppet::Type.type(:package).new(:name => platform_params[:package_name])
catalog.add_resource package, @glance_image_import_config
dependency = @glance_image_import_config.autorequire
expect(dependency.size).to eq(1)
expect(dependency[0].target).to eq(@glance_image_import_config)
expect(dependency[0].source).to eq(package)
end
end
context 'on Debian platforms' do
let :platform_params do
{ :package_name => 'glance-api',
:osfamily => 'Debian' }
end
it_behaves_like 'glance_image_import_config'
end
context 'on RedHat platforms' do
let :platform_params do
{ :package_name => 'openstack-glance',
:osfamily => 'RedHat'}
end
it_behaves_like 'glance_image_import_config'
it 'should autorequire the package that install the file' do
catalog = Puppet::Resource::Catalog.new
anchor = Puppet::Type.type(:anchor).new(:name => 'glance::install::end')
catalog.add_resource anchor, @glance_image_import_config
dependency = @glance_image_import_config.autorequire
expect(dependency.size).to eq(1)
expect(dependency[0].target).to eq(@glance_image_import_config)
expect(dependency[0].source).to eq(anchor)
end
end

38
spec/unit/type/glance_registry_config_spec.rb
View File

@ -3,39 +3,17 @@ require 'puppet/type/glance_registry_config'
describe 'Puppet::Type.type(:glance_registry_config)' do
before :each do
Puppet::Type.rmtype(:glance_registry_config)
Facter.fact(:osfamily).stubs(:value).returns(platform_params[:osfamily])
@glance_registry_config = Puppet::Type.type(:glance_registry_config).new(:name => 'DEFAULT/foo', :value => 'bar')
end
shared_examples_for 'glance_registry_config' do
it 'should autorequire the package that install the file' do
catalog = Puppet::Resource::Catalog.new
package = Puppet::Type.type(:package).new(:name => platform_params[:package_name])
catalog.add_resource package, @glance_registry_config
dependency = @glance_registry_config.autorequire
expect(dependency.size).to eq(1)
expect(dependency[0].target).to eq(@glance_registry_config)
expect(dependency[0].source).to eq(package)
end
end
context 'on Debian platforms' do
let :platform_params do
{ :package_name => 'glance-registry',
:osfamily => 'Debian' }
end
it_behaves_like 'glance_registry_config'
end
context 'on RedHat platforms' do
let :platform_params do
{ :package_name => 'openstack-glance',
:osfamily => 'RedHat'}
end
it_behaves_like 'glance_registry_config'
it 'should autorequire the package that install the file' do
catalog = Puppet::Resource::Catalog.new
anchor = Puppet::Type.type(:anchor).new(:name => 'glance::install::end')
catalog.add_resource anchor, @glance_registry_config
dependency = @glance_registry_config.autorequire
expect(dependency.size).to eq(1)
expect(dependency[0].target).to eq(@glance_registry_config)
expect(dependency[0].source).to eq(anchor)
end
end

84
spec/unit/type/glance_registry_paste_ini_spec.rb
View File

@ -3,85 +3,17 @@ require 'puppet/type/glance_registry_paste_ini'
describe 'Puppet::Type.type(:glance_registry_paste_ini)' do
before :each do
Puppet::Type.rmtype(:glance_registry_paste_ini)
Facter.fact(:osfamily).stubs(:value).returns(platform_params[:osfamily])
@glance_registry_paste_ini = Puppet::Type.type(:glance_registry_paste_ini).new(:name => 'DEFAULT/foo', :value => 'bar')
end
shared_examples_for 'glance_registry_paste_ini' do
it 'should require a name' do
expect {
Puppet::Type.type(:glance_registry_paste_ini).new({})
}.to raise_error(Puppet::Error, 'Title or name must be provided')
end
it 'should not expect a name with whitespace' do
expect {
Puppet::Type.type(:glance_registry_paste_ini).new(:name => 'f oo')
}.to raise_error(Puppet::Error, /Parameter name failed/)
end
it 'should fail when there is no section' do
expect {
Puppet::Type.type(:glance_registry_paste_ini).new(:name => 'foo')
}.to raise_error(Puppet::Error, /Parameter name failed/)
end
it 'should not require a value when ensure is absent' do
Puppet::Type.type(:glance_registry_paste_ini).new(:name => 'DEFAULT/foo', :ensure => :absent)
end
it 'should accept a valid value' do
@glance_registry_paste_ini[:value] = 'bar'
expect(@glance_registry_paste_ini[:value]).to eq('bar')
end
it 'should not accept a value with whitespace' do
@glance_registry_paste_ini[:value] = 'b ar'
expect(@glance_registry_paste_ini[:value]).to eq('b ar')
end
it 'should accept valid ensure values' do
@glance_registry_paste_ini[:ensure] = :present
expect(@glance_registry_paste_ini[:ensure]).to eq(:present)
@glance_registry_paste_ini[:ensure] = :absent
expect(@glance_registry_paste_ini[:ensure]).to eq(:absent)
end
it 'should not accept invalid ensure values' do
expect {
@glance_registry_paste_ini[:ensure] = :latest
}.to raise_error(Puppet::Error, /Invalid value/)
end
it 'should autorequire the package that install the file' do
catalog = Puppet::Resource::Catalog.new
package = Puppet::Type.type(:package).new(:name => platform_params[:package_name])
catalog.add_resource package, @glance_registry_paste_ini
dependency = @glance_registry_paste_ini.autorequire
expect(dependency.size).to eq(1)
expect(dependency[0].target).to eq(@glance_registry_paste_ini)
expect(dependency[0].source).to eq(package)
end
end
context 'on Debian platforms' do
let :platform_params do
{ :package_name => 'glance-registry',
:osfamily => 'Debian' }
end
it_behaves_like 'glance_registry_paste_ini'
end
context 'on RedHat platforms' do
let :platform_params do
{ :package_name => 'openstack-glance',
:osfamily => 'RedHat'}
end
it_behaves_like 'glance_registry_paste_ini'
it 'should autorequire the package that install the file' do
catalog = Puppet::Resource::Catalog.new
anchor = Puppet::Type.type(:anchor).new(:name => 'glance::install::end')
catalog.add_resource anchor, @glance_registry_paste_ini
dependency = @glance_registry_paste_ini.autorequire
expect(dependency.size).to eq(1)
expect(dependency[0].target).to eq(@glance_registry_paste_ini)
expect(dependency[0].source).to eq(anchor)
end
end

38
spec/unit/type/glance_swift_config_spec.rb
View File

@ -3,39 +3,17 @@ require 'puppet/type/glance_swift_config'
describe 'Puppet::Type.type(:glance_swift_config)' do
before :each do
Puppet::Type.rmtype(:glance_swift_config)
Facter.fact(:osfamily).stubs(:value).returns(platform_params[:osfamily])
@glance_swift_config = Puppet::Type.type(:glance_swift_config).new(:name => 'DEFAULT/foo', :value => 'bar')
end
shared_examples_for 'glance_swift_config' do
it 'should autorequire the package that install the file' do
catalog = Puppet::Resource::Catalog.new
package = Puppet::Type.type(:package).new(:name => platform_params[:package_name])
catalog.add_resource package, @glance_swift_config
dependency = @glance_swift_config.autorequire
expect(dependency.size).to eq(1)
expect(dependency[0].target).to eq(@glance_swift_config)
expect(dependency[0].source).to eq(package)
end
end
context 'on Debian platforms' do
let :platform_params do
{ :package_name => 'glance-api',
:osfamily => 'Debian' }
end
it_behaves_like 'glance_swift_config'
end
context 'on RedHat platforms' do
let :platform_params do
{ :package_name => 'openstack-glance',
:osfamily => 'RedHat'}
end
it_behaves_like 'glance_swift_config'
it 'should autorequire the package that install the file' do
catalog = Puppet::Resource::Catalog.new
anchor = Puppet::Type.type(:anchor).new(:name => 'glance::install::end')
catalog.add_resource anchor, @glance_swift_config
dependency = @glance_swift_config.autorequire
expect(dependency.size).to eq(1)
expect(dependency[0].target).to eq(@glance_swift_config)
expect(dependency[0].source).to eq(anchor)
end
end