Skip to content

Commit

Permalink
rename udev::udevadm -> udev::udevadm::trigger
Browse files Browse the repository at this point in the history
For naming consistency with udev::udevadm::logpriority
  • Loading branch information
Joshua Hoblitt committed Sep 20, 2013
1 parent 1ca5e24 commit a69f1b8
Show file tree
Hide file tree
Showing 6 changed files with 9 additions and 11 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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'],
}
```

Expand Down
2 changes: 1 addition & 1 deletion manifests/init.pp
Original file line number Diff line number Diff line change
Expand Up @@ -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']
}
2 changes: 1 addition & 1 deletion manifests/rule.pp
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@
owner => 'root',
group => 'root',
mode => '0644',
notify => Class['udev::udevadm'],
notify => Class['udev::udevadm::trigger'],
}

$safe_config = merge(
Expand Down
7 changes: 3 additions & 4 deletions manifests/udevadm.pp → manifests/udevadm/trigger.pp
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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],
}
Expand Down
2 changes: 1 addition & 1 deletion spec/classes/udev_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
@@ -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'],
})
Expand Down

0 comments on commit a69f1b8

Please sign in to comment.