From 96c7f29e6b0c445413ba1b2ede977b4a386bbf8f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rapha=C3=ABl=20Pinson?= <raphael.pinson@camptocamp.com>
Date: Thu, 5 Apr 2012 16:39:17 +0200
Subject: Change $augeas::version into $augeas::base::version for inheritance
 reasons

---
 manifests/base.pp   | 5 +++++
 manifests/debian.pp | 2 +-
 manifests/init.pp   | 5 -----
 manifests/redhat.pp | 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

(limited to 'manifests')

diff --git a/manifests/base.pp b/manifests/base.pp
index 65b9ae6..3f75ad6 100644
--- a/manifests/base.pp
+++ b/manifests/base.pp
@@ -1,6 +1,11 @@
 class augeas::base {
   $lens_dir = '/usr/share/augeas/lenses/contrib'
 
+  $version = $augeas_version ? {
+    ''      => 'present',
+    default => $augeas_version
+  }
+
   # ensure no file not managed by puppet ends up in there.
   file { $lens_dir:
     ensure  => directory,
diff --git a/manifests/debian.pp b/manifests/debian.pp
index d3ed5c6..f31397b 100644
--- a/manifests/debian.pp
+++ b/manifests/debian.pp
@@ -2,7 +2,7 @@ class augeas::debian inherits augeas::base {
 
   package {
     ['augeas-lenses', 'libaugeas0', 'augeas-tools']:
-      ensure => "${augeas::version}",
+      ensure => "${augeas::base::version}",
       before => File['/usr/share/augeas/lenses/contrib'],
   }
   package {'libaugeas-ruby1.8': ensure => present }
diff --git a/manifests/init.pp b/manifests/init.pp
index 19d161b..545e012 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -1,10 +1,5 @@
 class augeas {
 
-  $version = $augeas_version ? {
-    ''      => 'present',
-    default => $augeas_version
-  }
-
   case $operatingsystem {
     /RedHat|CentOS|Fedora/:   { include augeas::redhat }
     /Debian|Ubuntu|kFreeBSD/: { include augeas::debian }
diff --git a/manifests/redhat.pp b/manifests/redhat.pp
index d881c74..4d459f4 100644
--- a/manifests/redhat.pp
+++ b/manifests/redhat.pp
@@ -2,7 +2,7 @@ class augeas::redhat inherits augeas::base {
 
   package {
     ['augeas', 'augeas-libs']:
-      ensure => "${augeas::version}",
+      ensure => "${augeas::base::version}",
       before => File['/usr/share/augeas/lenses/contrib'],
   }
   package { 'ruby-augeas': ensure => present }
-- 
cgit v1.2.3