Added explicit error when using indexer_discovery without setting cm

CHANGELOG.md

@@ -1,3 +1,7 @@
+### 3.4.3
+
+- Added explicit error when using indexer_discovery without setting cm
+
 ### 3.4.2
 
 - Fixed service status confusion (Issue #16)

manifests/outputs.pp

@@ -1,5 +1,6 @@
 # vim: ts=2 sw=2 et
 class splunk::outputs (
+  $type = $splunk::type,
   $tcpout = $splunk::tcpout,
   $clustering = $splunk::clustering,
   $splunk_os_user = $splunk::real_splunk_os_user,
@@ -13,8 +14,10 @@
   $sslrootcapath   = $splunk::sslrootcapath,
   $sslcertpath   = $splunk::sslcertpath
 ){
-  if $clustering[cm] == undef {
+  if $clustering[cm] == undef and $type == undef {
     $cm = "${::fqdn}:8089"
+  } elsif $clustering[cm] == undef and $type == 'uf' and $tcpout == 'indexer_discovery' {
+    fail "please set cluster master when using indexer_discovery"
   } else {
     $cm = $clustering[cm]
   }

metadata.json

@@ -1,6 +1,6 @@
 {
   "name": "jorritfolmer-splunk",
-  "version": "3.4.2",
+  "version": "3.4.3",
   "author": "Jorrit Folmer",
   "summary": "Deploy Splunk indexers, search heads and universal forwarders into any imaginable topology, distributed or (multisite) clustered.",
   "license": "MIT",

spec/classes/init_spec.rb

@@ -167,6 +167,17 @@
     it { should_not contain_file('/opt/splunkforwarder/etc/apps/puppet_indexer_cluster_pass4symmkey_base/local/server.conf') }
   end
 
+  context 'with universalforwarder, tcpout == indexer_discovery but without cm' do
+    let(:params) { 
+      {
+        :type => 'uf',
+        :tcpout => 'indexer_discovery',
+        :admin => { 'hash' => 'zzzz', 'fn' => 'yyyy', 'email' => 'wwww', },
+      }
+    }
+    it { should compile.and_raise_error(/please set cluster master when using indexer_discovery/) }
+  end
+
   context 'with searchpeers as array' do
     let(:params) { 
       {