Merge pull request #67 from georgemihaescu/systemd_timeout

moves systemd timeout to variable
bdwyertech · Apr 2, 2019 · 6045c89 · 6045c89
2 parents b8df2d7 + 85c4ed4
commit 6045c89
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/attributes/default.rb b/attributes/default.rb
@@ -38,3 +38,6 @@
 # => Init Script Timeouts (Seconds)
 default['wildfly']['initd']['startup_wait'] = '60'
 default['wildfly']['initd']['shutdown_wait'] = '60'
+
+# => SystemD Script Timeouts (Seconds)
+default['wildfly']['systemd']['timeout'] = '60'
diff --git a/resources/wildfly.rb b/resources/wildfly.rb
@@ -53,6 +53,8 @@
   offset = offset ? offset.split('=')[1] : '0'
   (offset.to_i + port.to_i).to_s
 }
+# => Timeout passed through to SystemD
+property :systemd_timeout, String, default: wildfly['systemd']['timeout']
 
 #
 # => Define the Default Resource Action
@@ -161,7 +163,7 @@
       cookbook 'wildfly'
       variables(
         start_marker: start_marker,
-        timeout: 60
+        timeout: new_resource.systemd_timeout
       )
       action :create
     end