Fixed order after package install

jorritfolmer · Feb 24, 2018 · 917f439 · 917f439
1 parent 1de8699
commit 917f439
Show file tree

Hide file tree

Showing 4 changed files with 49 additions and 16 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,7 @@
+### 3.9.1
+
+- Fixed issue where splunk first time run would happen before install
+
 ### 3.9.0
 
 - Add setting to control maxKBps in limits.conf

diff --git a/README.md b/README.md
@@ -995,14 +995,15 @@ These people haves contributed pull requests, issues, ideas or otherwise spent t
 
 - Chris Bowles (cbowlesUT)
 - Dimitri Tischenko (timidri)
+- dkangel37
 - FlorinTar
 - jsushetski
 - Michael Fyffe (TraGicCode)
 - Miro (mirogta)
 - Nate McCurdy (natemccurdy)
 - negast
-- Steve Myers (stmyers)
 - RampentPotato
+- Steve Myers (stmyers)
 - TheChuckMo
 
 ## License

diff --git a/manifests/installed.pp b/manifests/installed.pp
@@ -26,29 +26,57 @@
         package { $package:
           ensure => installed,
         }
+        -> exec { 'splunk initial run':
+          command => "${splunk_home}/bin/splunk version --accept-license --answer-yes --no-prompt",
+          path    => ["${splunk_home}/bin", '/bin', '/sbin', '/usr/bin', '/usr/sbin'],
+          require => Package[$package],
+          user    => $splunk_os_user,
+          creates => "${splunk_home}/etc/system/local/server.conf",
+          notify  => Exec['splunk enable boot-start'],
+        }
+        -> exec { 'splunk enable boot-start':
+          command     => "${splunk_home}/bin/splunk enable boot-start -user ${splunk_os_user} --accept-license --answer-yes --no-prompt",
+          path        => ["${splunk_home}/bin", '/bin', '/sbin', '/usr/bin', '/usr/sbin'],
+          require     => Package[$package],
+          refreshonly => true,
+        }
       } elsif $version == undef and package_source != undef {
         package { $package:
           ensure => installed,
           name   => $package_source,
         }
+        -> exec { 'splunk initial run':
+          command => "${splunk_home}/bin/splunk version --accept-license --answer-yes --no-prompt",
+          path    => ["${splunk_home}/bin", '/bin', '/sbin', '/usr/bin', '/usr/sbin'],
+          require => Package[$package],
+          user    => $splunk_os_user,
+          creates => "${splunk_home}/etc/system/local/server.conf",
+          notify  => Exec['splunk enable boot-start'],
+        }
+        -> exec { 'splunk enable boot-start':
+          command     => "${splunk_home}/bin/splunk enable boot-start -user ${splunk_os_user} --accept-license --answer-yes --no-prompt",
+          path        => ["${splunk_home}/bin", '/bin', '/sbin', '/usr/bin', '/usr/sbin'],
+          require     => Package[$package],
+          refreshonly => true,
+        }
       } else {
         package { $package:
           ensure => $version,
         }
-      }
-      exec { 'splunk initial run':
-        command => "${splunk_home}/bin/splunk version --accept-license --answer-yes --no-prompt",
-        path    => ["${splunk_home}/bin", '/bin', '/sbin', '/usr/bin', '/usr/sbin'],
-        require => Package[$package],
-        user    => $splunk_os_user,
-        creates => "${splunk_home}/etc/system/local/server.conf",
-        notify  => Exec['splunk enable boot-start'],
-      }
-      exec { 'splunk enable boot-start':
-        command     => "${splunk_home}/bin/splunk enable boot-start -user ${splunk_os_user} --accept-license --answer-yes --no-prompt",
-        path        => ["${splunk_home}/bin", '/bin', '/sbin', '/usr/bin', '/usr/sbin'],
-        require     => Package[$package],
-        refreshonly => true,
+        -> exec { 'splunk initial run':
+          command => "${splunk_home}/bin/splunk version --accept-license --answer-yes --no-prompt",
+          path    => ["${splunk_home}/bin", '/bin', '/sbin', '/usr/bin', '/usr/sbin'],
+          require => Package[$package],
+          user    => $splunk_os_user,
+          creates => "${splunk_home}/etc/system/local/server.conf",
+          notify  => Exec['splunk enable boot-start'],
+        }
+        -> exec { 'splunk enable boot-start':
+          command     => "${splunk_home}/bin/splunk enable boot-start -user ${splunk_os_user} --accept-license --answer-yes --no-prompt",
+          path        => ["${splunk_home}/bin", '/bin', '/sbin', '/usr/bin', '/usr/sbin'],
+          require     => Package[$package],
+          refreshonly => true,
+        }
       }
     }
   }

diff --git a/metadata.json b/metadata.json
@@ -1,6 +1,6 @@
 {
   "name": "jorritfolmer-splunk",
-  "version": "3.9.0",
+  "version": "3.9.1",
   "author": "Jorrit Folmer",
   "summary": "Deploy Splunk indexers, search heads and universal forwarders into any imaginable topology, distributed or (multisite) clustered.",
   "license": "MIT",