From 2fd403476e77a545355443667408ba0cf6205fcd Mon Sep 17 00:00:00 2001 From: Micah Anderson Date: Tue, 12 Feb 2013 13:39:12 -0500 Subject: remove the apt-get autoclean from the initial apt-get update, this just slows things down and I don't see a need for it --- puppet/modules/site_apt/manifests/dist_upgrade.pp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'puppet/modules/site_apt/manifests/dist_upgrade.pp') diff --git a/puppet/modules/site_apt/manifests/dist_upgrade.pp b/puppet/modules/site_apt/manifests/dist_upgrade.pp index f129dd73..f8ea05fc 100644 --- a/puppet/modules/site_apt/manifests/dist_upgrade.pp +++ b/puppet/modules/site_apt/manifests/dist_upgrade.pp @@ -4,7 +4,7 @@ class site_apt::dist_upgrade { fail ('apt-get is running in background - Please wait until it finishes. Exiting.') } else { exec{'initial_apt_update': - command => '/usr/bin/apt-get update && /usr/bin/apt-get autoclean', + command => '/usr/bin/apt-get update', refreshonly => false, } exec{'initial_apt_dist_upgrade': -- cgit v1.2.3 From 77c8025aebe3a7b83fc128be6e0abe511f9f0888 Mon Sep 17 00:00:00 2001 From: varac Date: Thu, 7 Mar 2013 16:36:54 +0100 Subject: increase Exec timeout for dist_upgrade --- puppet/modules/site_apt/manifests/dist_upgrade.pp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'puppet/modules/site_apt/manifests/dist_upgrade.pp') diff --git a/puppet/modules/site_apt/manifests/dist_upgrade.pp b/puppet/modules/site_apt/manifests/dist_upgrade.pp index f8ea05fc..91301efd 100644 --- a/puppet/modules/site_apt/manifests/dist_upgrade.pp +++ b/puppet/modules/site_apt/manifests/dist_upgrade.pp @@ -1,6 +1,6 @@ class site_apt::dist_upgrade { - if $::apt_running == 'true' { + if $::apt_running == 'true' { fail ('apt-get is running in background - Please wait until it finishes. Exiting.') } else { exec{'initial_apt_update': @@ -10,6 +10,7 @@ class site_apt::dist_upgrade { exec{'initial_apt_dist_upgrade': command => "/usr/bin/apt-get -q -y -o 'DPkg::Options::=--force-confold' dist-upgrade", refreshonly => false, + timeout => 1200, } } } -- cgit v1.2.3 From 0af4cb352017db95606f64f69b316d360bf2675d Mon Sep 17 00:00:00 2001 From: varac Date: Sun, 10 Mar 2013 15:50:43 +0100 Subject: increase timeout for initial_apt_update to 6 min --- puppet/modules/site_apt/manifests/dist_upgrade.pp | 1 + 1 file changed, 1 insertion(+) (limited to 'puppet/modules/site_apt/manifests/dist_upgrade.pp') diff --git a/puppet/modules/site_apt/manifests/dist_upgrade.pp b/puppet/modules/site_apt/manifests/dist_upgrade.pp index 91301efd..08de31bb 100644 --- a/puppet/modules/site_apt/manifests/dist_upgrade.pp +++ b/puppet/modules/site_apt/manifests/dist_upgrade.pp @@ -6,6 +6,7 @@ class site_apt::dist_upgrade { exec{'initial_apt_update': command => '/usr/bin/apt-get update', refreshonly => false, + timeout => 360, } exec{'initial_apt_dist_upgrade': command => "/usr/bin/apt-get -q -y -o 'DPkg::Options::=--force-confold' dist-upgrade", -- cgit v1.2.3