openstack/puppet-cinder
Code Issues Proposed changes

Merge "Require should refer to package title"

Browse Source
This commit is contained in:
Jenkins 2013-05-09 01:13:43 +00:00 committed by Gerrit Code Review
commit ddf5ed4bb8
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
manifests/init.pp
View File

@ -41,8 +41,8 @@ class cinder (
anchor { 'cinder-start': }
package { 'cinder':
name => $::cinder::params::package_name,
ensure => $package_ensure,
name => $::cinder::params::package_name,
ensure => $package_ensure,
require => Anchor['cinder-start'],
}
@ -51,7 +51,7 @@ class cinder (
owner => 'cinder',
group => 'cinder',
mode => '0600',
require => Package[$::cinder::params::package_name],
require => Package['cinder'],
}
file { $::cinder::params::cinder_paste_api_ini:
@ -59,7 +59,7 @@ class cinder (
owner => 'cinder',
group => 'cinder',
mode => '0600',
require => Package[$::cinder::params::package_name],
require => Package['cinder'],
}
if $rpc_backend == 'cinder.openstack.common.rpc.impl_kombu' {

4
spec/classes/cinder_spec.rb
View File

@ -58,14 +58,14 @@ describe 'cinder' do
:owner => 'cinder',
:group => 'cinder',
:mode => '0600',
:require => 'Package[cinder-common]'
:require => 'Package[cinder]'
) }
it { should contain_file('/etc/cinder/api-paste.ini').with(
:owner => 'cinder',
:group => 'cinder',
:mode => '0600',
:require => 'Package[cinder-common]'
:require => 'Package[cinder]'
) }
end