Browse Source

Merge pull request #565 from jfryman/revert-560-fix_missing_fact_operatingsystemmajrelease

Revert "changed $::operatingsystemmajrelease to $::lsbmajdistrelease for...
James Fryman 9 years ago
parent
commit
a19cb94f23
2 changed files with 3 additions and 3 deletions
  1. 1 1
      manifests/params.pp
  2. 2 2
      spec/classes/package_spec.rb

+ 1 - 1
manifests/params.pp

@@ -20,7 +20,7 @@ class nginx::params {
     }
     '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',

+ 2 - 2
spec/classes/package_spec.rb

@@ -52,10 +52,10 @@ describe 'nginx::package' do
     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