openstack/puppet-glance
Code Issues Proposed changes

Merge "Allow overriding ensure for glance-registry"

Browse Source
This commit is contained in:
Jenkins 2015-01-12 12:29:35 +00:00 committed by Gerrit Code Review
commit 30d215a784
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*] # [*keystone_password*]
# (required) The keystone password for administrative user # (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*] # [*verbose*]
# (optional) Enable verbose logs (true|false). Defaults to false. # (optional) Enable verbose logs (true|false). Defaults to false.
# #
@ -106,6 +111,7 @@
# #
class glance::registry( class glance::registry(
$keystone_password, $keystone_password,
$package_ensure = 'present',
$verbose = false, $verbose = false,
$debug = false, $debug = false,
$bind_host = '0.0.0.0', $bind_host = '0.0.0.0',
@ -142,7 +148,8 @@ class glance::registry(
} }
if ( $glance::params::api_package_name != $glance::params::registry_package_name ) { 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/'] 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 let :facts do
{ :osfamily => 'Debian' } { :osfamily => 'Debian' }
end 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 end
describe 'on RedHat platforms' do describe 'on RedHat platforms' do