Merge pull request #35 from grid5000/pmorillon/omsa

Fixes bug#8975 about DELL OMSA service shutdown
oar-team · Feb 9, 2018 · 5967450 · 5967450
2 parents 16ccdae + 3459748
commit 5967450
Showing 1 changed file with 6 additions and 6 deletions.
diff --git a/virtualbox/steps/data/puppet/modules/env/manifests/std/dell.pp b/virtualbox/steps/data/puppet/modules/env/manifests/std/dell.pp
@@ -29,18 +29,18 @@
             'src' => false
           }
         }
-    
+
         package {
           ['srvadmin-all', 'dtk-scripts']:
             ensure   => 'installed',
             require  => [Apt::Source['linux.dell.com'], Exec['apt_update']]
         }
-  
+
         service { 'dataeng':
           enable => 'true',
           require => Package['srvadmin-all', 'dtk-scripts']
         }
-  
+
         # Fix bug 7324
         file { '/etc/omreg.cfg':
           ensure => 'link',
@@ -97,22 +97,22 @@
           enable => 'true',
           require => Package['srvadmin-base']
         }
-  
+
         # Fix bug 7324
         file { '/etc/omreg.cfg':
           ensure => 'link',
           target => '/opt/dell/srvadmin/etc/omreg.cfg',
           require => Package['srvadmin-base']
         }
 
-        # Fix bug 8048
+        # Fix bug 8048 and 8975
         file {
           '/etc/systemd/system/dataeng.service.d':
             ensure  => 'directory',
             require => Package['srvadmin-base'];
           '/etc/systemd/system/dataeng.service.d/stop.conf':
             ensure  => 'file',
-            content => "[Service]\nExecStop=\n",
+            content => "[Service]\nExecStop=\nKillMode=control-group\nKillSignal=9",
             require => Package['srvadmin-base'];
         }
       }