Merge 3b14d5f into fe3b8a8

spec/spec_helper_acceptance.rb

@@ -20,6 +20,11 @@
   # Configure all nodes in nodeset
   c.before :suite do
     hosts.each do |host|
+      # Reduce the stop second timeout so we do not run into concurrency problems.
+      # The actual cause of the corosync refresh hasn't been found yet, but this seems like a doable workaround.
+      on host, 'mkdir /etc/systemd/system/pacemaker.service.d'
+      on host, 'echo -e "[Service]\nTimeoutStopSec=30s" > /etc/systemd/system/pacemaker.service.d/10-timeout-stop-sec.conf'
+
       if host[:platform] =~ %r{el-7-x86_64} && host[:hypervisor] =~ %r{docker}
         on(host, "sed -i '/nodocs/d' /etc/yum.conf")
       end