diff options
| author | Michael Gooden <me@michaelgooden.net> | 2016-11-03 17:27:01 +0200 |
|---|---|---|
| committer | Michael Gooden <me@michaelgooden.net> | 2016-11-03 17:27:01 +0200 |
| commit | f71392e03f2b5bf0c843880d05b910df0a4b9e49 (patch) | |
| tree | e4828a23600d4bb7443bb6cd2746e143fe5128d9 | |
| parent | 7e901cb6c6e87823daaa81e49b82e1873034df8f (diff) | |
Include the release pocket on Ubuntu Xenial and Yakkety.
As per https://bugs.launchpad.net/ubuntu/+source/unattended-upgrades/+bug/1624641
the release pocket should be included to allow additional dependencies to be
installed if required by a security update.
Signed-off-by: Michael Gooden <me@michaelgooden.net>
| -rw-r--r-- | manifests/params.pp | 1 | ||||
| -rw-r--r-- | spec/classes/unattended_upgrades_spec.rb | 2 |
2 files changed, 3 insertions, 0 deletions
diff --git a/manifests/params.pp b/manifests/params.pp index 4451bf1..dbdb91b 100644 --- a/manifests/params.pp +++ b/manifests/params.pp @@ -85,6 +85,7 @@ class unattended_upgrades::params { 'xenial', 'yakkety': { $legacy_origin = true $origins = [ + '${distro_id}:${distro_codename}', #lint:ignore:single_quote_string_with_variables '${distro_id}:${distro_codename}-security', #lint:ignore:single_quote_string_with_variables ] } diff --git a/spec/classes/unattended_upgrades_spec.rb b/spec/classes/unattended_upgrades_spec.rb index 747ccb1..5831da0 100644 --- a/spec/classes/unattended_upgrades_spec.rb +++ b/spec/classes/unattended_upgrades_spec.rb @@ -316,6 +316,7 @@ describe 'unattended_upgrades' do ).with_content( # This is the only section that's different for Ubuntu compared to Debian /\Unattended-Upgrade::Allowed-Origins\ {\n + \t"\${distro_id}\:\${distro_codename}";\n \t"\${distro_id}\:\${distro_codename}-security";\n };/x ) @@ -339,6 +340,7 @@ describe 'unattended_upgrades' do ).with_content( # This is the only section that's different for Ubuntu compared to Debian /\Unattended-Upgrade::Allowed-Origins\ {\n + \t"\${distro_id}\:\${distro_codename}";\n \t"\${distro_id}\:\${distro_codename}-security";\n };/x ) |