diff options
| author | micah anderson <micah@riseup.net> | 2014-10-29 01:13:40 +0800 |
|---|---|---|
| committer | Gerrit Code Review <gerrit2@review.leap.se> | 2014-10-29 01:13:40 +0800 |
| commit | f77177e67820e85e24b0c109506f05be404e005a (patch) | |
| tree | 9c624f016a4eb934117cc15fe98399ff6b6f2da8 /puppet/modules/site_apt/manifests | |
| parent | 937c61b74bbd99f9955cbee426fb35e96050eea6 (diff) | |
| parent | f14cfe9601ab60b30af7baf126cb223eacec3593 (diff) | |
Merge "upgrade unattended-upgrades on deploy (#6245)" into develop
Diffstat (limited to 'puppet/modules/site_apt/manifests')
| -rw-r--r-- | puppet/modules/site_apt/manifests/init.pp | 4 | ||||
| -rw-r--r-- | puppet/modules/site_apt/manifests/unattended_upgrades.pp | 10 |
2 files changed, 12 insertions, 2 deletions
diff --git a/puppet/modules/site_apt/manifests/init.pp b/puppet/modules/site_apt/manifests/init.pp index 9facf4cc..633ccf1e 100644 --- a/puppet/modules/site_apt/manifests/init.pp +++ b/puppet/modules/site_apt/manifests/init.pp @@ -1,4 +1,4 @@ -class site_apt { +class site_apt { class { 'apt': custom_key_dir => 'puppet:///modules/site_apt/keys' @@ -11,7 +11,7 @@ class site_apt { content => 'Acquire::PDiffs "false";'; } - include ::apt::unattended_upgrades + include ::site_apt::unattended_upgrades apt::sources_list { 'secondary.list.disabled': content => template('site_apt/secondary.list'); diff --git a/puppet/modules/site_apt/manifests/unattended_upgrades.pp b/puppet/modules/site_apt/manifests/unattended_upgrades.pp new file mode 100644 index 00000000..daebffab --- /dev/null +++ b/puppet/modules/site_apt/manifests/unattended_upgrades.pp @@ -0,0 +1,10 @@ +class site_apt::unattended_upgrades inherits apt::unattended_upgrades { + # override unattended-upgrades package resource to make sure + # that it is upgraded on every deploy (#6245) + + include ::apt::unattended_upgrades + + Package['unattended-upgrades'] { + ensure => latest + } +} |