Revert "changed $::operatingsystemmajrelease to $::lsbmajdistrelease …

…for Debian"
slm0n87 · Feb 6, 2015 · 420ec9f · 420ec9f
1 parent d5de40d
commit 420ec9f
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/manifests/params.pp b/manifests/params.pp
@@ -20,7 +20,7 @@
     }
     'Debian': {
       if ($::operatingsystem == 'ubuntu' and $::lsbdistcodename in ['lucid', 'precise', 'trusty'])
-      or ($::operatingsystem == 'debian' and $::lsbmajdistrelease in ['6', '7']) {
+      or ($::operatingsystem == 'debian' and $::operatingsystemmajrelease in ['6', '7']) {
         $_module_os_overrides = {
           'manage_repo' => true,
           'daemon_user' => 'www-data',

diff --git a/spec/classes/package_spec.rb b/spec/classes/package_spec.rb
@@ -52,10 +52,10 @@
     end
   end
 
-  shared_examples 'debian' do |operatingsystem, lsbdistcodename, lsbdistid, lsbmajdistrelease|
+  shared_examples 'debian' do |operatingsystem, lsbdistcodename, lsbdistid, operatingsystemmajrelease|
     let(:facts) {{
       :operatingsystem => operatingsystem,
-      :lsbmajdistrelease => lsbmajdistrelease,
+      :operatingsystemmajrelease => operatingsystemmajrelease,
       :osfamily        => 'Debian',
       :lsbdistcodename => lsbdistcodename,
       :lsbdistid       => lsbdistid