diff options
author | Joseph (Jy) Yaworski <jyaworski@carotid.us> | 2016-09-12 09:09:05 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-09-12 09:09:05 -0400 |
commit | f02afe282e5ec3612a666d21911368b3edd7dad1 (patch) | |
tree | 2b0d1e4bc60e81075cc939688be4d13f3ba6a8ae /manifests/params.pp | |
parent | d256c8027c2d34fc8c5c6e0c64be5ff3b5aac8c5 (diff) | |
parent | 33fabe02547a8c4b15278fe8636d83fe1354f4ae (diff) |
Merge pull request #62 from raoulbhatia/ubuntu
[WIP] Ubuntu updates
Diffstat (limited to 'manifests/params.pp')
-rw-r--r-- | manifests/params.pp | 18 |
1 files changed, 13 insertions, 5 deletions
diff --git a/manifests/params.pp b/manifests/params.pp index 046da45..4451bf1 100644 --- a/manifests/params.pp +++ b/manifests/params.pp @@ -21,6 +21,7 @@ class unattended_upgrades::params { 'lsbdistid' => $::lsbdistid, 'lsbdistcodename' => $::lsbdistcodename, 'lsbmajdistrelease' => $::lsbmajdistrelease, + 'lsbdistrelease' => $::lsbdistrelease, } } else { # Strict variables facts lookup compatibility @@ -37,6 +38,10 @@ class unattended_upgrades::params { true => $::lsbmajdistrelease, default => undef, }, + 'lsbdistrelease' => defined('$lsbdistrelease') ? { + true => $::lsbdistrelease, + default => undef, + }, } } @@ -63,28 +68,31 @@ class unattended_upgrades::params { } } 'ubuntu': { - # TODO do we really want to pull in ${distro_codename}-updates by default? case $xfacts['lsbdistcodename'] { 'precise': { $legacy_origin = true $origins = [ '${distro_id}:${distro_codename}-security', #lint:ignore:single_quote_string_with_variables - #'${distro_id}:${distro_codename}-updates', #lint:ignore:single_quote_string_with_variables ] } - 'trusty', 'utopic', 'vivid', 'wily': { + 'trusty', 'wily': { + $legacy_origin = true + $origins = [ + '${distro_id}:${distro_codename}-security', #lint:ignore:single_quote_string_with_variables + ] + } + 'xenial', 'yakkety': { $legacy_origin = true $origins = [ '${distro_id}:${distro_codename}-security', #lint:ignore:single_quote_string_with_variables - #'${distro_id}:${distro_codename}-updates', #lint:ignore:single_quote_string_with_variables ] } default: { + warning("Ubuntu ${xfacts['lsbdistrelease']} \"${xfacts['lsbdistcodename']}\" has reached End of Life - please upgrade!") $legacy_origin = true $origins = [ '${distro_id}:${distro_codename}-security', #lint:ignore:single_quote_string_with_variables - #'${distro_id}:${distro_codename}-updates', #lint:ignore:single_quote_string_with_variables ] } } |