From d404a31e789d9e2d90aa1238374a11fd3d3f565b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rapha=C3=ABl=20Pinson?= Date: Wed, 13 Mar 2013 11:17:16 +0100 Subject: Reorganize classes --- manifests/base.pp | 42 ------------------------------------------ manifests/debian.pp | 18 ------------------ manifests/files.pp | 32 ++++++++++++++++++++++++++++++++ manifests/init.pp | 15 +++++++++------ manifests/packages.pp | 21 +++++++++++++++++++++ manifests/params.pp | 20 ++++++++++++++++++++ manifests/redhat.pp | 13 ------------- 7 files changed, 82 insertions(+), 79 deletions(-) delete mode 100644 manifests/base.pp delete mode 100644 manifests/debian.pp create mode 100644 manifests/files.pp create mode 100644 manifests/packages.pp create mode 100644 manifests/params.pp delete mode 100644 manifests/redhat.pp (limited to 'manifests') diff --git a/manifests/base.pp b/manifests/base.pp deleted file mode 100644 index 37ad0e2..0000000 --- a/manifests/base.pp +++ /dev/null @@ -1,42 +0,0 @@ -class augeas::base { - $lens_dir = '/usr/share/augeas/lenses' - - $version = $augeas_version ? { - '' => 'present', - default => $augeas_version - } - - $rubylib_version = $augeas_ruby_version ? { - '' => 'present', - default => $augeas_ruby_version - } - - # ensure no file not managed by puppet ends up in there. - file { $lens_dir: - ensure => directory, - purge => true, - force => true, - recurse => true, - recurselimit => 1, - mode => '0644', - owner => 'root', - group => 'root', - } - - file { "${lens_dir}/dist": - ensure => directory, - purge => false, - mode => '0644', - owner => 'root', - group => 'root', - } - - file { "${lens_dir}/tests": - ensure => directory, - purge => true, - force => true, - mode => '0644', - owner => 'root', - group => 'root', - } -} diff --git a/manifests/debian.pp b/manifests/debian.pp deleted file mode 100644 index bc2e3eb..0000000 --- a/manifests/debian.pp +++ /dev/null @@ -1,18 +0,0 @@ -class augeas::debian inherits augeas::base { - - package { - ['augeas-lenses', 'libaugeas0', 'augeas-tools']: - ensure => $augeas::base::version, - before => File['/usr/share/augeas/lenses'], - } - - $augeas_ruby = $::lsbdistcodename ? { - 'wheezy' => 'libaugeas-ruby1.9.1', - default => 'libaugeas-ruby1.8', - } - - package {$augeas_ruby: - ensure => $augeas::base::rubylib_version, - } - -} diff --git a/manifests/files.pp b/manifests/files.pp new file mode 100644 index 0000000..01427ad --- /dev/null +++ b/manifests/files.pp @@ -0,0 +1,32 @@ +class augeas::files { + $lens_dir = $augeas::lens_dir + + # ensure no file not managed by puppet ends up in there. + file { $lens_dir: + ensure => directory, + purge => true, + force => true, + recurse => true, + recurselimit => 1, + mode => '0644', + owner => 'root', + group => 'root', + } + + file { "${lens_dir}/dist": + ensure => directory, + purge => false, + mode => '0644', + owner => 'root', + group => 'root', + } + + file { "${lens_dir}/tests": + ensure => directory, + purge => true, + force => true, + mode => '0644', + owner => 'root', + group => 'root', + } +} diff --git a/manifests/init.pp b/manifests/init.pp index e82e21c..9b8ba42 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -1,7 +1,10 @@ -class augeas { - case $::operatingsystem { - /RedHat|CentOS|Fedora/: { include augeas::redhat } - /Debian|Ubuntu|kFreeBSD/: { include augeas::debian } - default: { include augeas::base } - } +class augeas ( + $version = $augeas_version, + $ruby_version = $augeas_ruby_version, + $lens_dir = $augeas::params::lens_dir, +) inherits augeas::params { + + class {'::augeas::packages': } -> + class {'::augeas::files': } -> + Class['augeas'] } diff --git a/manifests/packages.pp b/manifests/packages.pp new file mode 100644 index 0000000..1192933 --- /dev/null +++ b/manifests/packages.pp @@ -0,0 +1,21 @@ +class augeas::packages { + # Augeas packages + $augeas_ensure = $augeas::version ? { + '' => 'present', + default => $augeas::version + } + + package { $augeas::params::pkgs: + ensure => $augeas_ensure, + } + + # Ruby package + $ruby_ensure = $augeas::ruby_version ? { + '' => 'present', + default => $augeas::ruby_version + } + + package { $augeas::params::ruby_pkg: + ensure => $ruby_ensure, + } +} diff --git a/manifests/params.pp b/manifests/params.pp new file mode 100644 index 0000000..e7120af --- /dev/null +++ b/manifests/params.pp @@ -0,0 +1,20 @@ +class augeas::params { + $lens_dir = '/usr/share/augeas/lenses' + + case $::osfamily { + 'RedHat': { + $ruby_pkg = 'ruby-augeas' + $augeas_pkgs = ['augeas', 'augeas-libs'] + } + + 'Debian': { + $ruby_pkg = $::lsbdistcodename ? { + 'wheezy' => 'libaugeas-ruby1.9.1', + default => 'libaugeas-ruby1.8', + } + $augeas_pkgs = ['augeas-lenses', 'libaugeas0', 'augeas-tools'] + } + + default: { fail("Unsupported OS family: ${::osfamily}") } + } +} diff --git a/manifests/redhat.pp b/manifests/redhat.pp deleted file mode 100644 index 1e95728..0000000 --- a/manifests/redhat.pp +++ /dev/null @@ -1,13 +0,0 @@ -class augeas::redhat inherits augeas::base { - - package { - ['augeas', 'augeas-libs']: - ensure => $augeas::base::version, - before => File['/usr/share/augeas/lenses'], - } - - package { 'ruby-augeas': - ensure => $augeas::base::rubylib_version, - } - -} -- cgit v1.2.3 From 0b807da215eadc363e9c9f67d5da37c034cf73dc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rapha=C3=ABl=20Pinson?= Date: Wed, 13 Mar 2013 11:21:59 +0100 Subject: Fix augeas::lens with new module organization --- manifests/lens.pp | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) (limited to 'manifests') diff --git a/manifests/lens.pp b/manifests/lens.pp index 55dc9ae..db65d11 100644 --- a/manifests/lens.pp +++ b/manifests/lens.pp @@ -31,10 +31,12 @@ define augeas::lens ( ) { if (!$stock_since or !versioncmp($::augeasversion, $stock_since)) { - include augeas::base + if !declared(Class['augeas']) { + fail('You must declare the augeas class before using augeas::lens') + } - $lens_dest = "${augeas::base::lens_dir}/${name}.aug" - $test_dest = "${augeas::base::lens_dir}/tests/test_${name}.aug" + $lens_dest = "${augeas::lens_dir}/${name}.aug" + $test_dest = "${augeas::lens_dir}/tests/test_${name}.aug" file { $lens_dest: ensure => $ensure, @@ -42,7 +44,7 @@ define augeas::lens ( } exec { "Typecheck lens ${name}": - command => "augparse -I ${augeas::base::lens_dir} ${lens_dest} || (rm -f ${lens_dest} && exit 1)", + command => "augparse -I ${augeas::lens_dir} ${lens_dest} || (rm -f ${lens_dest} && exit 1)", refreshonly => true, subscribe => File[$lens_dest], } @@ -55,7 +57,7 @@ define augeas::lens ( } 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::lens_dir} ${test_dest} || (rm -f ${lens_dest} && rm -f ${test_dest} && exit 1)", refreshonly => true, subscribe => File[$lens_dest, $test_dest], } -- cgit v1.2.3 From 9ecff9bf6ea2606e70e0244bcd7ed1a466c87e74 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rapha=C3=ABl=20Pinson?= Date: Wed, 13 Mar 2013 11:24:14 +0100 Subject: Use defined instead of declared --- manifests/lens.pp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'manifests') diff --git a/manifests/lens.pp b/manifests/lens.pp index db65d11..f4d2ba2 100644 --- a/manifests/lens.pp +++ b/manifests/lens.pp @@ -31,7 +31,7 @@ define augeas::lens ( ) { if (!$stock_since or !versioncmp($::augeasversion, $stock_since)) { - if !declared(Class['augeas']) { + if !defined(Class['augeas']) { fail('You must declare the augeas class before using augeas::lens') } -- cgit v1.2.3 From d20fee71946820d13dfa6c788590011c9de6a320 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rapha=C3=ABl=20Pinson?= Date: Wed, 13 Mar 2013 11:30:09 +0100 Subject: Fix ::params::pkgs as ::params::augeas_pkgs --- manifests/packages.pp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'manifests') diff --git a/manifests/packages.pp b/manifests/packages.pp index 1192933..39c1c23 100644 --- a/manifests/packages.pp +++ b/manifests/packages.pp @@ -5,7 +5,7 @@ class augeas::packages { default => $augeas::version } - package { $augeas::params::pkgs: + package { $augeas::params::augeas_pkgs: ensure => $augeas_ensure, } -- cgit v1.2.3 From 616b59bead6a57f71b4b4e59aaf080cd130ab250 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rapha=C3=ABl=20Pinson?= Date: Thu, 14 Mar 2013 09:42:08 +0100 Subject: Abstract package name for ruby-augeas, define dependency for all Augeas resources --- manifests/init.pp | 2 ++ manifests/packages.pp | 3 ++- 2 files changed, 4 insertions(+), 1 deletion(-) (limited to 'manifests') diff --git a/manifests/init.pp b/manifests/init.pp index 9b8ba42..6374955 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -7,4 +7,6 @@ class augeas ( class {'::augeas::packages': } -> class {'::augeas::files': } -> Class['augeas'] + + Package['ruby-augeas'] -> Augeas <| |> } diff --git a/manifests/packages.pp b/manifests/packages.pp index 39c1c23..e41f800 100644 --- a/manifests/packages.pp +++ b/manifests/packages.pp @@ -15,7 +15,8 @@ class augeas::packages { default => $augeas::ruby_version } - package { $augeas::params::ruby_pkg: + package { 'ruby-augeas': ensure => $ruby_ensure, + name => $augeas::params::ruby_pkg, } } -- cgit v1.2.3 From 461deeeebf4336fe485f566083813e9d1ac3f9ab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rapha=C3=ABl=20Pinson?= Date: Fri, 15 Mar 2013 20:39:38 +0100 Subject: Fix augeas::lens --- manifests/lens.pp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'manifests') diff --git a/manifests/lens.pp b/manifests/lens.pp index f4d2ba2..723f217 100644 --- a/manifests/lens.pp +++ b/manifests/lens.pp @@ -29,11 +29,11 @@ define augeas::lens ( $test_source=false, $stock_since=false, ) { + if !defined(Class['augeas']) { + fail('You must declare the augeas class before using augeas::lens') + } - if (!$stock_since or !versioncmp($::augeasversion, $stock_since)) { - if !defined(Class['augeas']) { - fail('You must declare the augeas class before using augeas::lens') - } + if (!$stock_since or versioncmp($::augeasversion, $stock_since) < 0) { $lens_dest = "${augeas::lens_dir}/${name}.aug" $test_dest = "${augeas::lens_dir}/tests/test_${name}.aug" -- cgit v1.2.3 From bcd9746bff9a54016077a93e359b66f1e104b926 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rapha=C3=ABl=20Pinson?= Date: Mon, 18 Mar 2013 11:57:30 +0100 Subject: Use validate_re to check $augeas::lens_dir in augeas::lens --- manifests/lens.pp | 2 ++ 1 file changed, 2 insertions(+) (limited to 'manifests') diff --git a/manifests/lens.pp b/manifests/lens.pp index 723f217..def3768 100644 --- a/manifests/lens.pp +++ b/manifests/lens.pp @@ -35,6 +35,8 @@ define augeas::lens ( if (!$stock_since or versioncmp($::augeasversion, $stock_since) < 0) { + validate_re($augeas::lens_dir, '/.*', '$augeas::lens_dir must be a valid path') + $lens_dest = "${augeas::lens_dir}/${name}.aug" $test_dest = "${augeas::lens_dir}/tests/test_${name}.aug" -- cgit v1.2.3 From ded6f67c399d31d6b3d6d5d7295bfad0cf786102 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rapha=C3=ABl=20Pinson?= Date: Mon, 18 Mar 2013 14:12:16 +0100 Subject: Make validate_re message clearer in augeas::lens --- manifests/lens.pp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'manifests') diff --git a/manifests/lens.pp b/manifests/lens.pp index def3768..06db221 100644 --- a/manifests/lens.pp +++ b/manifests/lens.pp @@ -35,7 +35,7 @@ define augeas::lens ( if (!$stock_since or versioncmp($::augeasversion, $stock_since) < 0) { - validate_re($augeas::lens_dir, '/.*', '$augeas::lens_dir must be a valid path') + validate_re($augeas::lens_dir, '/.*', "'${augeas::lens_dir}' is not a valid path for lens ${name}") $lens_dest = "${augeas::lens_dir}/${name}.aug" $test_dest = "${augeas::lens_dir}/tests/test_${name}.aug" -- cgit v1.2.3 From 0c6ca2848fbbe849a3e59779ffeb2c7979c6b0c2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rapha=C3=ABl=20Pinson?= Date: Fri, 22 Mar 2013 10:09:35 +0100 Subject: Doc and lint --- manifests/files.pp | 4 ++++ manifests/init.pp | 8 ++++++++ manifests/lens.pp | 53 +++++++++++++++++++++++++++-------------------------- 3 files changed, 39 insertions(+), 26 deletions(-) (limited to 'manifests') diff --git a/manifests/files.pp b/manifests/files.pp index 01427ad..4f36a57 100644 --- a/manifests/files.pp +++ b/manifests/files.pp @@ -1,3 +1,7 @@ +# Class: augeas::files +# +# Sets up directories and files for Augeas +# class augeas::files { $lens_dir = $augeas::lens_dir diff --git a/manifests/init.pp b/manifests/init.pp index 6374955..80fbbd8 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -1,3 +1,11 @@ +# Class: augeas +# +# Install and configure Augeas +# +# Parameters: +# ['version'] - the desired version of Augeas +# ['ruby_version'] - the desired version of the Ruby bindings for Augeas +# ['lens_dir'] - the lens directory to use class augeas ( $version = $augeas_version, $ruby_version = $augeas_ruby_version, diff --git a/manifests/lens.pp b/manifests/lens.pp index 06db221..ac4fddf 100644 --- a/manifests/lens.pp +++ b/manifests/lens.pp @@ -1,28 +1,25 @@ -/* - -== Definition: augeas::lens - -Deploy an Augeas lens (and its test file). -Check the lens (and run the unit tests) automatically and remove the files if -the checks fail. - -Parameters: -- *ensure*: present/absent -- *lens_source*: the source for the lens -- *test_source*: optionally, the source for the test file. -- *stock_since*: optionally, indicate in which version of Augeas - the lens became stock, so it will not be deployed above that version. - -Example usage: - - augeas::lens { 'networkmanager': - lens_source => 'puppet:///modules/networkmanager/lenses/networkmanager.aug', - test_source => 'puppet:///modules/networkmanager/lenses/test_networkmanager.aug', - stock_since => '1.0.0', - } - -*/ - +# Definition: augeas::lens +# +# Deploy an Augeas lens (and its test file). +# Check the lens (and run the unit tests) automatically and remove the files if +# the checks fail. +# +# Parameters: +# ['ensure'] - present/absent +# ['lens_source'] - the source for the lens +# ['test_source'] - optionally, the source for the test file. +# ['stock_since'] - optionally, indicate in which version of Augeas +# the lens became stock, so it will not be deployed +# above that version. +# +# Example usage: +# +# augeas::lens { 'networkmanager': +# lens_source => 'puppet:///modules/networkmanager/lenses/networkmanager.aug', +# test_source => 'puppet:///modules/networkmanager/lenses/test_networkmanager.aug', +# stock_since => '1.0.0', +# } +# define augeas::lens ( $lens_source, $ensure=present, @@ -35,7 +32,11 @@ define augeas::lens ( if (!$stock_since or versioncmp($::augeasversion, $stock_since) < 0) { - validate_re($augeas::lens_dir, '/.*', "'${augeas::lens_dir}' is not a valid path for lens ${name}") + validate_re( + $augeas::lens_dir, + '/.*', + "'${augeas::lens_dir}' is not a valid path for lens ${name}" + ) $lens_dest = "${augeas::lens_dir}/${name}.aug" $test_dest = "${augeas::lens_dir}/tests/test_${name}.aug" -- cgit v1.2.3 From 3cdeb92a29db581f0d0f8a987c22de0a94971726 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rapha=C3=ABl=20Pinson?= Date: Fri, 22 Mar 2013 10:10:22 +0100 Subject: doc --- manifests/packages.pp | 4 ++++ manifests/params.pp | 4 ++++ 2 files changed, 8 insertions(+) (limited to 'manifests') diff --git a/manifests/packages.pp b/manifests/packages.pp index e41f800..91dbb74 100644 --- a/manifests/packages.pp +++ b/manifests/packages.pp @@ -1,3 +1,7 @@ +# Class: augeas::packages +# +# Sets up packages for Augeas +# class augeas::packages { # Augeas packages $augeas_ensure = $augeas::version ? { diff --git a/manifests/params.pp b/manifests/params.pp index e7120af..ee2dbea 100644 --- a/manifests/params.pp +++ b/manifests/params.pp @@ -1,3 +1,7 @@ +# Class: augeas::params +# +# Default parameters for the Augeas module +# class augeas::params { $lens_dir = '/usr/share/augeas/lenses' -- cgit v1.2.3 From 5b0631950a43acdd8a2a2236dc1b772e7f16e449 Mon Sep 17 00:00:00 2001 From: Patrick Hemmer Date: Fri, 5 Apr 2013 10:09:26 -0400 Subject: Better detection of ruby version --- manifests/params.pp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'manifests') diff --git a/manifests/params.pp b/manifests/params.pp index ee2dbea..9998308 100644 --- a/manifests/params.pp +++ b/manifests/params.pp @@ -12,9 +12,10 @@ class augeas::params { } 'Debian': { - $ruby_pkg = $::lsbdistcodename ? { - 'wheezy' => 'libaugeas-ruby1.9.1', - default => 'libaugeas-ruby1.8', + if versioncmp($::rubyversion, '1.9.1') >= 0 { + $ruby_pkg = 'libaugeas-ruby1.9.1' + } else { + $ruby_pkg = 'libaugeas-ruby1.8' } $augeas_pkgs = ['augeas-lenses', 'libaugeas0', 'augeas-tools'] } -- cgit v1.2.3