Merge pull request #62 from raoulbhatia/ubuntu

[WIP] Ubuntu updates

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
           ]
         }
       }