new style for 2.7

1 files changed, 5 insertions, 7 deletions

diff --git a/manifests/linux.pp b/manifests/linux.pp
index fcd3936..6fc17ba 100644
--- a/manifests/linux.pp
+++ b/manifests/linux.pp
@@ -1,22 +1,20 @@
 class puppet::linux inherits puppet::base {
 
-  if !$puppet_ensure_version { $puppet_ensure_version = 'installed' }
   package { 'puppet':
-    ensure => $puppet_ensure_version,
+    ensure => $puppet::ensure_version,
   }
 
-  if !$facter_ensure_version { $facter_ensure_version = 'installed' }
   package { 'facter':
-    ensure => $facter_ensure_version,
+    ensure => $puppet::ensure_facter_version,
   }
 
   Service['puppet']{
     require => Package[puppet],
   }
-  
+
   file { '/etc/cron.d/puppetd.cron':
-    source => [ "puppet:///modules/site-puppet/cron.d/puppetd",
-                "puppet:///modules/puppet/cron.d/puppetd.${operatingsystem}",
+    source => [ "puppet:///modules/site_puppet/cron.d/puppetd",
+                "puppet:///modules/puppet/cron.d/puppetd.${::operatingsystem}",
                 "puppet:///modules/puppet/cron.d/puppetd" ],
     owner => root, group => 0, mode => 0644,
   }