Fix facter path for Solaris

abstractitptyltd · Jan 29, 2018 · 16d791a · 16d791a
1 parent bf503ee
commit 16d791a
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 5 deletions.
diff --git a/manifests/defaults.pp b/manifests/defaults.pp
@@ -46,8 +46,13 @@
         'datadir' => '/etc/puppetlabs/code/hieradata/%{environment}'
       }
     }
-    $facterbasepath            = '/opt/puppetlabs/facter'
-    $reports_dir               = '/opt/puppetlabs/server/data/reports'
+    if $::osfamily == 'Solaris' {
+      $facterbasepath            = '/var/puppetlabs/puppet/cache'
+      $reports_dir               = '/var/puppetlabs/puppet/cache/reports'
+    } else {
+      $facterbasepath            = '/opt/puppetlabs/facter'
+      $reports_dir               = '/opt/puppetlabs/server/data/reports'
+    }
     $terminus_package          = 'puppetdb-termini'
     $puppetdb_etcdir           = '/etc/puppetlabs/puppetdb'
     $puppetdb_test_url         = '/pdb/meta/v1/version'

diff --git a/spec/classes/puppet_facts_spec.rb b/spec/classes/puppet_facts_spec.rb
@@ -82,7 +82,12 @@
       end
       it { is_expected.to compile.with_all_deps }
       if Puppet.version.to_f >= 4.0
-        facterbasepath  = '/opt/puppetlabs/facter'
+        case facts[:osfamily]
+        when 'Solaris'
+          facterbasepath  = '/var/puppetlabs/puppet/cache'
+        else
+          facterbasepath  = '/opt/puppetlabs/facter'
+        end
       else
         facterbasepath  = '/etc/facter'
       end

diff --git a/spec/classes/puppet_spec.rb b/spec/classes/puppet_spec.rb
@@ -105,7 +105,12 @@
       end
       it { is_expected.to compile.with_all_deps }
       if Puppet.version.to_f >= 4.0
-        facterbasepath  = '/opt/puppetlabs/facter'
+        case facts[:osfamily]
+        when 'Solaris'
+          facterbasepath  = '/var/puppetlabs/puppet/cache'
+        else
+          facterbasepath  = '/opt/puppetlabs/facter'
+        end
         facterbasepath_group = 'root'
       else
         facterbasepath  = '/etc/facter'

diff --git a/spec/defines/fact_spec.rb b/spec/defines/fact_spec.rb
@@ -78,7 +78,12 @@
       end
 
       if Puppet.version.to_f >= 4.0
-        facterbasepath  = '/opt/puppetlabs/facter'
+        case facts[:osfamily]
+        when 'Solaris'
+          facterbasepath  = '/var/puppetlabs/puppet/cache'
+        else
+          facterbasepath  = '/opt/puppetlabs/facter'
+        end
         facterbasepath_group = 'root'
       else
         facterbasepath  = '/etc/facter'