diff options
| author | Raphaël Pinson <raphael.pinson@camptocamp.com> | 2012-04-04 18:23:52 +0200 |
|---|---|---|
| committer | Raphaël Pinson <raphael.pinson@camptocamp.com> | 2012-04-04 18:23:52 +0200 |
| commit | d8fb9f0a57dca53058388f8246007c17786c9167 (patch) | |
| tree | 9906335499a311061eaca309c2edea1ebf449f7b /manifests | |
| parent | a602fe6540fbf7b367752acfd32fcfc0803013c0 (diff) | |
Continue linting
Diffstat (limited to 'manifests')
| -rw-r--r-- | manifests/debian.pp | 8 | ||||
| -rw-r--r-- | manifests/init.pp | 4 | ||||
| -rw-r--r-- | manifests/lens.pp | 24 | ||||
| -rw-r--r-- | manifests/redhat.pp | 8 |
4 files changed, 22 insertions, 22 deletions
diff --git a/manifests/debian.pp b/manifests/debian.pp index 51203b4..52e0dad 100644 --- a/manifests/debian.pp +++ b/manifests/debian.pp @@ -1,10 +1,10 @@ class augeas::debian inherits augeas::base { package { - ["augeas-lenses", "libaugeas0", "augeas-tools"]: - ensure => $augeas_version, - before => File["/usr/share/augeas/lenses/contrib"], + ['augeas-lenses', 'libaugeas0', 'augeas-tools']: + ensure => $::augeas_version, + before => File['/usr/share/augeas/lenses/contrib'], } - package { "libaugeas-ruby1.8": ensure => present } + package {'libaugeas-ruby1.8': ensure => present } } diff --git a/manifests/init.pp b/manifests/init.pp index a9ebad0..967ddd8 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -1,7 +1,7 @@ class augeas { - if ( ! $augeas_version ) { - $augeas_version = "present" + if ( ! $::augeas_version ) { + $::augeas_version = 'present' } case $operatingsystem { diff --git a/manifests/lens.pp b/manifests/lens.pp index 27d856f..4a1009e 100644 --- a/manifests/lens.pp +++ b/manifests/lens.pp @@ -12,16 +12,16 @@ Parameters: Example usage: - augeas::lens { "networkmanager": - lens_source => "puppet:///modules/networkmanager/lenses/networkmanager.aug", - test_source => "puppet:///modules/networkmanager/lenses/test_networkmanager.aug", + augeas::lens { 'networkmanager': + lens_source => 'puppet:///modules/networkmanager/lenses/networkmanager.aug', + test_source => 'puppet:///modules/networkmanager/lenses/test_networkmanager.aug', } */ define augeas::lens ( - $ensure=present, $lens_source, + $ensure=present, $test_source=false ) { @@ -29,29 +29,29 @@ define augeas::lens ( $lens_dest = "${augeas::base::lens_dir}/${name}.aug" $test_dest = "${augeas::base::lens_dir}/tests/test_${name}.aug" - - file { "${lens_dest}": + + file { $lens_dest: ensure => $ensure, source => $lens_source, } exec { "Typecheck lens ${name}": - command => "augparse -I ${augeas::base::lens_dir} ${lens_dest} || (rm -f ${lens_dest} && exit 1)", + command => "augparse -I ${augeas::base::lens_dir} ${lens_dest} || (rm -f ${lens_dest} && exit 1)", refreshonly => true, - subscribe => File[$lens_dest], + subscribe => File[$lens_dest], } if $test_source { - file { "${test_dest}": + file { $test_dest: ensure => $ensure, source => $test_source, notify => Exec["Test lens ${name}"] } - + exec { "Test lens ${name}": - command => "augparse -I ${augeas::base::lens_dir} ${test_dest} || (rm -f ${lens_dest} && rm -f ${test_dest} && exit 1)", + command => "augparse -I ${augeas::base::lens_dir} ${test_dest} || (rm -f ${lens_dest} && rm -f ${test_dest} && exit 1)", refreshonly => true, - subscribe => File[$lens_dest, $test_dest], + subscribe => File[$lens_dest, $test_dest], } } } diff --git a/manifests/redhat.pp b/manifests/redhat.pp index 4632fc1..79b0d36 100644 --- a/manifests/redhat.pp +++ b/manifests/redhat.pp @@ -1,10 +1,10 @@ class augeas::redhat inherits augeas::base { package { - ["augeas", "augeas-libs"]: - ensure => $augeas_version, - before => File["/usr/share/augeas/lenses/contrib"], + ['augeas', 'augeas-libs']: + ensure => $::augeas_version, + before => File['/usr/share/augeas/lenses/contrib'], } - package { "ruby-augeas": ensure => present } + package { 'ruby-augeas': ensure => present } } |