diff options
| author | varac <varacanero@zeromail.org> | 2012-12-10 15:54:32 +0100 |
|---|---|---|
| committer | varac <varacanero@zeromail.org> | 2012-12-10 15:54:32 +0100 |
| commit | d54dabff2726e728da6a9d31588bc2a52783a9a6 (patch) | |
| tree | 93d83842be133f416ed3a6890792c075a6ebfed5 | |
| parent | 9c671a9b1e4d13545c511eefd1eac274c16f80de (diff) | |
include site_apt::dist_upgrade (fixes #1107)
| -rw-r--r-- | puppet/modules/site_apt/manifests/dist_upgrade.pp | 10 | ||||
| -rw-r--r-- | puppet/modules/site_config/manifests/apt.pp | 2 |
2 files changed, 12 insertions, 0 deletions
diff --git a/puppet/modules/site_apt/manifests/dist_upgrade.pp b/puppet/modules/site_apt/manifests/dist_upgrade.pp new file mode 100644 index 00000000..5ae9297f --- /dev/null +++ b/puppet/modules/site_apt/manifests/dist_upgrade.pp @@ -0,0 +1,10 @@ +class site_apt::dist_upgrade inherits apt::dist_upgrade { + + # really upgrade on every puppetrun + Exec["apt_dist-upgrade"]{ + refreshonly => false, + } + + # Ensure apt-get upgrade has been run before installing any packages + Exec["apt_dist-upgrade"] -> Package <| name != 'lsb-release' |> +} diff --git a/puppet/modules/site_config/manifests/apt.pp b/puppet/modules/site_config/manifests/apt.pp index 4f611ac8..f7ba9ac9 100644 --- a/puppet/modules/site_config/manifests/apt.pp +++ b/puppet/modules/site_config/manifests/apt.pp @@ -1,8 +1,10 @@ class site_config::apt { include ::apt + include site_apt::dist_upgrade apt::apt_conf { '90disable-pdiffs': content => 'Acquire::PDiffs "false";'; } + } |