From: Mathieu Gagné Date: Fri, 5 Apr 2013 01:34:15 +0000 (-0400) Subject: Use implicit dependencies X-Git-Tag: grizzly-eol~15^2~9^2~7 X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=b84a26f6c03da2656cbddf0814332e76bcbc45a8;p=puppet-modules%2Fpuppet-ceilometer.git Use implicit dependencies Puppet has implicit dependencies: - Users and Groups have an implicit dependency - Implicitly orders users and groups - Implicitly recognizes file hierarchy - Implicitly creates relationship between file ownership and user resources --- diff --git a/manifests/init.pp b/manifests/init.pp index 4e19fb4..df85919 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -23,10 +23,7 @@ class ceilometer ( gid => $::ceilometer::params::groupname, groups => ['nova'], system => true, - require => [ - Group['ceilometer'], - Package['ceilometer-common'] - ], + require => Package['ceilometer-common'], } file { '/etc/ceilometer/': @@ -34,7 +31,7 @@ class ceilometer ( owner => 'ceilometer', group => 'ceilometer', mode => '0750', - require => [Package['ceilometer-common'], User['ceilometer']], + require => Package['ceilometer-common'], } file { '/etc/ceilometer/ceilometer.conf': @@ -42,7 +39,6 @@ class ceilometer ( owner => 'ceilometer', group => 'ceilometer', mode => '0640', - require => [File['/etc/ceilometer'], User['ceilometer']], } package { 'ceilometer-common': diff --git a/spec/classes/ceilometer_init_spec.rb b/spec/classes/ceilometer_init_spec.rb index eb63c69..4968266 100644 --- a/spec/classes/ceilometer_init_spec.rb +++ b/spec/classes/ceilometer_init_spec.rb @@ -32,7 +32,7 @@ describe 'ceilometer' do :gid => 'ceilometer', :groups => ['nova'], :system => true, - :require => ['Group[ceilometer]', 'Package[ceilometer-common]'] + :require => 'Package[ceilometer-common]' ) end @@ -42,7 +42,7 @@ describe 'ceilometer' do :owner => 'ceilometer', :group => 'ceilometer', :mode => '0750', - :require => ['Package[ceilometer-common]','User[ceilometer]'] + :require => 'Package[ceilometer-common]' ) end @@ -51,8 +51,7 @@ describe 'ceilometer' do :ensure => 'file', :owner => 'ceilometer', :group => 'ceilometer', - :mode => '0640', - :require => ['File[/etc/ceilometer]', 'User[ceilometer]'] + :mode => '0640' ) end