diff options
| author | varac <varacanero@zeromail.org> | 2012-12-19 10:06:21 +0100 |
|---|---|---|
| committer | varac <varacanero@zeromail.org> | 2012-12-19 10:06:21 +0100 |
| commit | 00d4663176e0b817ab0eb1f4312da0a6069a4958 (patch) | |
| tree | 5904a6e2679cc579ffb608061cfe876dbce6cdf8 /puppet/modules/site_apt | |
| parent | cded90f839871cf6258d7dc28d3ce81cf7f9cf6c (diff) | |
| parent | d54dabff2726e728da6a9d31588bc2a52783a9a6 (diff) | |
Merge branch 'feature/dist_upgrade' into develop
Conflicts:
puppet/modules/site_apt/manifests/init.pp
Diffstat (limited to 'puppet/modules/site_apt')
| -rw-r--r-- | puppet/modules/site_apt/manifests/dist_upgrade.pp | 10 | ||||
| -rw-r--r-- | puppet/modules/site_apt/manifests/init.pp | 1 |
2 files changed, 11 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_apt/manifests/init.pp b/puppet/modules/site_apt/manifests/init.pp index 7d1d039c..631f5742 100644 --- a/puppet/modules/site_apt/manifests/init.pp +++ b/puppet/modules/site_apt/manifests/init.pp @@ -1,6 +1,7 @@ class site_apt { include ::apt + include site_apt::dist_upgrade apt::apt_conf { '90disable-pdiffs': content => 'Acquire::PDiffs "false";'; |