diff --git a/README.md b/README.md index 6a297f4..fd3a5ec 100644 --- a/README.md +++ b/README.md @@ -87,7 +87,7 @@ As is commonly done with the `file` type, you can pass the output of the `templa ```puppet file { '/etc/etc/udev/rules.d/99-myfrobnicator.rules': ... - notify => Class['udev::udevadm'], + notify => Class['udev::udevadm::trigger'], } ``` diff --git a/manifests/init.pp b/manifests/init.pp index 56b8386..4f2b1b5 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -36,7 +36,7 @@ notify => Class['udev::udevadm::logpriority'], } - class { 'udev::udevadm': } -> + class { 'udev::udevadm::trigger': } -> class { 'udev::udevadm::logpriority': udev_log => $udev_log } -> Class['udev'] } diff --git a/manifests/rule.pp b/manifests/rule.pp index 9c31c5d..432353a 100644 --- a/manifests/rule.pp +++ b/manifests/rule.pp @@ -76,7 +76,7 @@ owner => 'root', group => 'root', mode => '0644', - notify => Class['udev::udevadm'], + notify => Class['udev::udevadm::trigger'], } $safe_config = merge( diff --git a/manifests/udevadm.pp b/manifests/udevadm/trigger.pp similarity index 78% rename from manifests/udevadm.pp rename to manifests/udevadm/trigger.pp index 565b78a..1a703aa 100644 --- a/manifests/udevadm.pp +++ b/manifests/udevadm/trigger.pp @@ -1,4 +1,4 @@ -# == Class: udev::udevadm +# == Class: udev::udevadm::trigger # # This class should not being included into the manifest directly. It's # function is to receive messages that the udev configuration files have @@ -8,17 +8,16 @@ # # file { '/etc/etc/udev/rules.d/99-myfrobnicator.rules': # ... -# notify => Class['udev::udevadm'], +# notify => Class['udev::udevadm::trigger'], # } # -class udev::udevadm inherits udev::params { +class udev::udevadm::trigger inherits udev::params { # adding `udevadm control --reload-rules` may be needed some day for edge # cases. # http://unix.stackexchange.com/questions/39370/how-to-reload-udev-rules-without-reboot exec { 'udevadm trigger': - command => 'udevadm trigger', refreshonly => true, path => [$udev::params::udevadm_path], } diff --git a/spec/classes/udev_spec.rb b/spec/classes/udev_spec.rb index 43c2b26..66f9eae 100644 --- a/spec/classes/udev_spec.rb +++ b/spec/classes/udev_spec.rb @@ -16,7 +16,7 @@ :mode => '0644', }). with_content(/udev_log="#{udev_log}"/) - should contain_class('udev::udevadm') + should contain_class('udev::udevadm::trigger') should contain_class('udev::udevadm::logpriority'). with_udev_log(udev_log) end diff --git a/spec/classes/udevadm_spec.rb b/spec/classes/udevadm/trigger_spec.rb similarity index 65% rename from spec/classes/udevadm_spec.rb rename to spec/classes/udevadm/trigger_spec.rb index 6490d48..34d3fe5 100644 --- a/spec/classes/udevadm_spec.rb +++ b/spec/classes/udevadm/trigger_spec.rb @@ -1,14 +1,13 @@ require 'spec_helper' -describe 'udev::udevadm', :type => :class do +describe 'udev::udevadm::trigger', :type => :class do describe 'for osfamily RedHat' do let(:facts) {{ :osfamily => 'RedHat' }} - it { should include_class('udev::udevadm') } + it { should include_class('udev::udevadm::trigger') } it do should contain_exec('udevadm trigger').with({ - :command => 'udevadm trigger', :refreshonly => true, :path => ['/sbin'], })