Add saltstack APT repository to automatic upgrades
* modules/openstack_project/manifests/automatic_upgrades.pp: Pass the additional allowed origins list through to the unattended upgrades module. * modules/openstack_project/manifests/slave.pp: Add the "LP-PPA-saltstack-salt precise" repository origin to the list of allowed origins for automatic upgrades. * modules/unattended_upgrades/manifests/init.pp: Add a list of additional allowed origins for package repository upgrades and convert the apt-preferences stub for 50unattended-upgrades to a template so the list can be applied to it. * modules/unattended_upgrades/templates/50unattended-upgrades.erb: Renamed from ../../files/50unattended-upgrades and enhanced with a loop over the origins list to append to the default set of allowed upgrade origins. Change-Id: I821d199ae1a00ed78c2a52bf80ddba8a4eaa7d8b
This commit is contained in:
parent
c03dd24c37
commit
e3bf9169d9
@ -1,6 +1,9 @@
|
||||
# == Class: unattended_upgrades
|
||||
#
|
||||
class unattended_upgrades($ensure = present) {
|
||||
class unattended_upgrades(
|
||||
$ensure = present,
|
||||
$origins = []
|
||||
) {
|
||||
package { 'unattended-upgrades':
|
||||
ensure => $ensure,
|
||||
}
|
||||
@ -23,7 +26,7 @@ class unattended_upgrades($ensure = present) {
|
||||
owner => 'root',
|
||||
group => 'root',
|
||||
mode => '0444',
|
||||
source => 'puppet:///modules/unattended_upgrades/50unattended-upgrades',
|
||||
content => template('unattended_upgrades/50unattended-upgrades.erb'),
|
||||
replace => true,
|
||||
}
|
||||
}
|
||||
|
@ -5,6 +5,9 @@ Unattended-Upgrade::Allowed-Origins {
|
||||
"${distro_id} ${distro_codename}-security";
|
||||
"${distro_id} ${distro_codename}-updates";
|
||||
// "${distro_id} ${distro_codename}-proposed-updates";
|
||||
<% origins.each do |origin| -%>
|
||||
"<%= origin %>";
|
||||
<% end -%>
|
||||
};
|
||||
|
||||
// List of packages to not update
|
Loading…
x
Reference in New Issue
Block a user