X-Git-Url: https://review.fuel-infra.org/gitweb?a=blobdiff_plain;f=manifests%2Fupdate.pp;h=9b1f68670967f54713b8acd0c45e19501efa7289;hb=0f9327bbf4c71f346a51eb554ba116f93ff26177;hp=26790ceafa8a34391336a4430111cdbc08ff65f0;hpb=501a1b5627687b13c0809b82db03f9df168fbd7a;p=puppet-modules%2Fpuppetlabs-apt.git

diff --git a/manifests/update.pp b/manifests/update.pp
index 26790ce..9b1f686 100644
--- a/manifests/update.pp
+++ b/manifests/update.pp
@@ -4,51 +4,45 @@ class apt::update {
   #on the first run, but if it's not run in awhile something is likely borked
   #with apt and we'd want to know about it.
 
-  if $::apt::always_apt_update == false {
-    #if always_apt_update is true there's no point in parsing this logic.
-
-    case $apt::apt_update_frequency {
-      'always': {
-        $_kick_apt = true
-      }
-      'daily': {
-        #compare current date with the apt_update_last_success fact to determine
-        #if we should kick apt_update.
-        $daily_threshold = (strftime('%s') - 86400)
-        if $::apt_update_last_success {
-          if $::apt_update_last_success < $daily_threshold {
-            $_kick_apt = true
-          } else {
-            $_kick_apt = false
-          }
-        } else {
-          #if apt-get update has not successfully run, we should kick apt_update
+  case $::apt::_update['frequency'] {
+    'always': {
+      $_kick_apt = true
+    }
+    'daily': {
+      #compare current date with the apt_update_last_success fact to determine
+      #if we should kick apt_update.
+      $daily_threshold = (strftime('%s') - 86400)
+      if $::apt_update_last_success {
+        if $::apt_update_last_success < $daily_threshold {
           $_kick_apt = true
+        } else {
+          $_kick_apt = false
         }
+      } else {
+        #if apt-get update has not successfully run, we should kick apt_update
+        $_kick_apt = true
       }
-      'weekly':{
-        #compare current date with the apt_update_last_success fact to determine
-        #if we should kick apt_update.
-        $weekly_threshold = (strftime('%s') - 604800)
-        if $::apt_update_last_success {
-          if ( $::apt_update_last_success < $weekly_threshold ) {
-            $_kick_apt = true
-          } else {
-            $_kick_apt = false
-          }
-        } else {
-          #if apt-get update has not successfully run, we should kick apt_update
+    }
+    'weekly':{
+      #compare current date with the apt_update_last_success fact to determine
+      #if we should kick apt_update.
+      $weekly_threshold = (strftime('%s') - 604800)
+      if $::apt_update_last_success {
+        if ( $::apt_update_last_success < $weekly_threshold ) {
           $_kick_apt = true
+        } else {
+          $_kick_apt = false
         }
-      }
-      default: {
-        #catches 'recluctantly', and any other value (which should not occur).
-        #do nothing.
-        $_kick_apt = false
+      } else {
+        #if apt-get update has not successfully run, we should kick apt_update
+        $_kick_apt = true
       }
     }
-  } else {
-    $_kick_apt = false
+    default: {
+      #catches 'reluctantly', and any other value (which should not occur).
+      #do nothing.
+      $_kick_apt = false
+    }
   }
 
   if $_kick_apt {
@@ -57,11 +51,11 @@ class apt::update {
     $_refresh = true
   }
   exec { 'apt_update':
-    command     => "${apt::params::provider} update",
+    command     => "${::apt::provider} update",
     logoutput   => 'on_failure',
     refreshonly => $_refresh,
-    timeout     => $apt::update_timeout,
-    tries       => $apt::update_tries,
+    timeout     => $::apt::_update['timeout'],
+    tries       => $::apt::_update['tries'],
     try_sleep   => 1
   }
 }