augeas: added a more convenient $augeas_version to handle version installed

2 files changed, 18 insertions, 29 deletions

diff --git a/README b/README
index 7918256..e68703a 100644
--- a/README
+++ b/README
@@ -8,32 +8,10 @@
 
 This module does 3 things:
 
- o ensure correct packages are installed for augeas.
-
- o backports augeas type from puppet rev cf648279 which fixes issue #1826
-   One must have "pluginsync=true" in puppet.conf for this to work.
+ o provides a few lenses only included in recent augeas releases.
  
  o creates /usr/share/augeas/lenses/contrib in which other modules can put
    custom lenses (see puppet-mysql/puppet-haproxy for working examples).
 
-The idea is to override this class to include your specific needs. Example:
-
-class augeas::my-redhat inherits augeas::redhat {
-
-  Package["augeas"] {
-    require => Yumrepo["epel-fedora-testing"],
-    tag => "install-augeas",
-    ensure => "0.4.1-1.el5";
-  }
-}
-
-class augeas::my-debian inherits augeas::debian {
-
-  Package["libaugeas0"] {
-    ensure => "latest";
-  }
-  Package["libaugeas-ruby1.8"] {
-    ensure => "0.2.0-2";
-  }
-}
-
+ o let's you force the version by defining $augeas_version, else puppet will
+   only ensure the packages are present.
diff --git a/manifests/classes/augeas.pp b/manifests/classes/augeas.pp
index 9df6ac0..41e3a48 100644
--- a/manifests/classes/augeas.pp
+++ b/manifests/classes/augeas.pp
@@ -1,4 +1,9 @@
 class augeas {
+
+  if ( ! $augeas_version ) {
+    $augeas_version = "present",
+  }
+
   case $operatingsystem {
     redhat: { include augeas::redhat }
     debian: { include augeas::debian }
@@ -18,15 +23,21 @@ class augeas::base {
 }
 
 class augeas::redhat inherits augeas::base {
+
   package {
-    ["augeas", "augeas-libs", "ruby-augeas"]:
-      ensure => "present";
+    ["augeas", "augeas-libs"]:
+      ensure => $augeas_version,
   }
+  package { "ruby-augeas": ensure => present }
+
 }
 
 class augeas::debian inherits augeas::base {
+
   package {
-    ["augeas-lenses", "libaugeas0", "augeas-tools", "libaugeas-ruby1.8"]:
-       ensure => "present";
+    ["augeas-lenses", "libaugeas0", "augeas-tools"]:
+       ensure => $augeas_version,
   }
+  package { "libaugeas-ruby1.8": ensure => present }
+
 }