Merge pull request voxpupuli#134 from TraGicCode/bug/splunkd_port_var…

…_not_defined SplunkForwarder has no concept of a splunkd_port
headyj · Sep 20, 2017 · 92018fe · 92018fe
2 parents a466146 + 0e4ba45
commit 92018fe
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 7 deletions.
diff --git a/manifests/forwarder.pp b/manifests/forwarder.pp
@@ -136,7 +136,6 @@
   case $::kernel {
     'Linux': {
       class { '::splunk::platform::posix':
-        splunkd_port => $splunkd_port,
         splunk_user  => $splunk_user,
       }
     }

diff --git a/manifests/platform/posix.pp b/manifests/platform/posix.pp
@@ -15,7 +15,7 @@
 # Requires: nothing
 #
 class splunk::platform::posix (
-  $splunkd_port = $splunk::splunkd_port,
+  $splunkd_port = undef,
   $splunk_user = $splunk::params::splunk_user,
   $server_service = undef,
 ) inherits splunk::virtual {

diff --git a/spec/classes/forwarder_spec.rb b/spec/classes/forwarder_spec.rb
@@ -6,11 +6,7 @@
       let(:facts) { os_facts }
 
       context 'with defaults' do
-        if os == 'solaris-11-i86pc'
-          pending
-        else
-          it { is_expected.to compile.with_all_deps }
-        end
+        it { is_expected.to compile.with_all_deps }
       end
     end
   end