diff options
| author | Micah Anderson <micah@leap.se> | 2014-10-28 12:18:27 -0400 |
|---|---|---|
| committer | Micah Anderson <micah@leap.se> | 2014-10-28 12:43:09 -0400 |
| commit | f14cfe9601ab60b30af7baf126cb223eacec3593 (patch) | |
| tree | a7d5dce414454ff70837c4d12eee76c8e5b63fa2 | |
| parent | 6cb63095c172c7a31123b9b423da66beb9298cee (diff) | |
upgrade unattended-upgrades on deploy (#6245)
unattended-upgrades is not able to upgrade itself in certain situations,
such as when the conffile prompt is generated due to the config being
changed. We want to set this package as latest in the platform so that
it is upgraded on every deploy (we deploy the config anyway).
Change-Id: I8c99bfb1b001079f0e1a4ffbf048e0e867633335
| -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 + } +} |