openstack
/
puppet-glance
Code Issues Proposed changes

Allow overriding ensure for glance-registry 

The main glance class allows overriding the package_ensure setting
from the default of 'present', but on Debian based systems
glance-registry is a separate package.  This package updates the
glance::registry class to allow overriding the package ensure there
also.

Change-Id: I6182836728102e827f9d5a3beef4964dd6e8d7f9
This commit is contained in:
Clayton O'Neill 2015-01-07 13:45:50 +00:00
parent 8a89b31ec6
commit 9befc700a1
2 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
manifests/registry.pp
View File

@ -7,6 +7,11 @@
# [*keystone_password*]
# (required) The keystone password for administrative user
#
# [*package_ensure*]
# (optional) Ensure state for package. Defaults to 'present'. On RedHat
# platforms this setting is ignored and the setting from the glance class is
# used because there is only one glance package.
#
# [*verbose*]
# (optional) Enable verbose logs (true|false). Defaults to false.
#
@ -106,6 +111,7 @@
#
class glance::registry(
$keystone_password,
$package_ensure = 'present',
$verbose = false,
$debug = false,
$bind_host = '0.0.0.0',
@ -142,7 +148,8 @@ class glance::registry(
}
if ( $glance::params::api_package_name != $glance::params::registry_package_name ) {
ensure_packages([$glance::params::registry_package_name])
ensure_packages( [$glance::params::registry_package_name],
{ ensure => $package_ensure })
}
Package[$glance::params::registry_package_name] -> File['/etc/glance/']

10
spec/classes/glance_registry_spec.rb
View File

@ -296,9 +296,15 @@ describe 'glance::registry' do
let :facts do
{ :osfamily => 'Debian' }
end
let(:params) { default_params }
it {should contain_package('glance-registry')}
# We only test this on Debian platforms, since on RedHat there isn't a
# separate package for glance registry.
['present', 'latest'].each do |package_ensure|
context "with package_ensure '#{package_ensure}'" do
let(:params) { default_params.merge({ :package_ensure => package_ensure })}
it {should contain_package('glance-registry').with_ensure(package_ensure)}
end
end
end
describe 'on RedHat platforms' do