From 559b2ccaa71e2c5c459d7a6bea39de975f15cb1c Mon Sep 17 00:00:00 2001
From: varac <varacanero@zeromail.org>
Date: Mon, 1 Feb 2016 16:53:10 +0100
Subject: [refactor] Use Exec[apt_updated] instead of Exec[refresh_apt]

Because this is the recommended way of depnending in the apt README.
---
 puppet/modules/site_apt/manifests/dist_upgrade.pp     | 2 +-
 puppet/modules/site_apt/manifests/init.pp             | 2 +-
 puppet/modules/site_config/manifests/default.pp       | 2 +-
 puppet/modules/site_config/manifests/remove/jessie.pp | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'puppet')

diff --git a/puppet/modules/site_apt/manifests/dist_upgrade.pp b/puppet/modules/site_apt/manifests/dist_upgrade.pp
index 40e2dd58..0eb98cea 100644
--- a/puppet/modules/site_apt/manifests/dist_upgrade.pp
+++ b/puppet/modules/site_apt/manifests/dist_upgrade.pp
@@ -11,7 +11,7 @@ class site_apt::dist_upgrade {
       command     => "/usr/bin/apt-get -q -y -o 'DPkg::Options::=--force-confold'  dist-upgrade",
       refreshonly => false,
       timeout     => 1200,
-      require     => Exec['refresh_apt']
+      require     => Exec['apt_updated']
     }
   }
 }
diff --git a/puppet/modules/site_apt/manifests/init.pp b/puppet/modules/site_apt/manifests/init.pp
index fea4b8e7..04b1ce69 100644
--- a/puppet/modules/site_apt/manifests/init.pp
+++ b/puppet/modules/site_apt/manifests/init.pp
@@ -55,7 +55,7 @@ class site_apt {
 # All packages should be installed _after_ refresh_apt is called,
 # which does an apt-get update.
 
-  Exec['refresh_apt'] ->
+  Exec['apt_updated'] ->
   Package <||>
 
 }
diff --git a/puppet/modules/site_config/manifests/default.pp b/puppet/modules/site_config/manifests/default.pp
index 96f06e6c..b5d0f32d 100644
--- a/puppet/modules/site_config/manifests/default.pp
+++ b/puppet/modules/site_config/manifests/default.pp
@@ -16,7 +16,7 @@ class site_config::default {
   # 'apt-get update' is executed by 'site_config::slow', it should be done
   # before any packages are installed.
 
-  Package { require => Exec['refresh_apt'] }
+  Package { require => Exec['apt_updated'] }
 
 
   # default class, used by all hosts
diff --git a/puppet/modules/site_config/manifests/remove/jessie.pp b/puppet/modules/site_config/manifests/remove/jessie.pp
index cbeaae05..c813e46d 100644
--- a/puppet/modules/site_config/manifests/remove/jessie.pp
+++ b/puppet/modules/site_config/manifests/remove/jessie.pp
@@ -3,7 +3,7 @@ class site_config::remove::jessie {
 
   tidy {
     '/etc/apt/preferences.d/rsyslog_anon_depends':
-      notify => Exec['refresh_apt'];
+      notify => Exec['apt_updated'];
   }
 
 }
-- 
cgit v1.2.3