[MediaWiki-commits] [Gerrit] operations/puppet[production]: Tools: Outfactor jobkill script to toollabs::node::all

[Tim Landscheidt (Code Review)]

Tim Landscheidt has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/335755 )

Change subject: Tools: Outfactor jobkill script to toollabs::node::all
......................................................................

Tools: Outfactor jobkill script to toollabs::node::all

Change-Id: Iac3b5c5c8b5e48930eebd85cdd15b12451003d13
---
M modules/role/manifests/toollabs/node/compute/dedicated.pp
M modules/role/manifests/toollabs/node/compute/general.pp
M modules/role/manifests/toollabs/node/web.pp
M modules/toollabs/manifests/node/all.pp
4 files changed, 8 insertions(+), 28 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/55/335755/1

diff --git a/modules/role/manifests/toollabs/node/compute/dedicated.pp 
b/modules/role/manifests/toollabs/node/compute/dedicated.pp
index aed44b3..a0ecc61 100644
--- a/modules/role/manifests/toollabs/node/compute/dedicated.pp
+++ b/modules/role/manifests/toollabs/node/compute/dedicated.pp
@@ -44,13 +44,4 @@
         config  => 'toollabs/gridengine/host-unrestricted.erb',
         require => File['/var/lib/gridengine'],
     }
-
-    file { '/usr/local/bin/jobkill':
-        ensure => file,
-        owner  => 'root',
-        group  => 'root',
-        mode   => '0555',
-        source => 'puppet:///modules/toollabs/jobkill',
-    }
-
 }
diff --git a/modules/role/manifests/toollabs/node/compute/general.pp 
b/modules/role/manifests/toollabs/node/compute/general.pp
index 8b2a916..050a550 100644
--- a/modules/role/manifests/toollabs/node/compute/general.pp
+++ b/modules/role/manifests/toollabs/node/compute/general.pp
@@ -23,14 +23,4 @@
     }
 
     class { '::toollabs::hostgroups': groups => [ '@general' ] }
-
-    file { '/usr/local/bin/jobkill':
-        ensure => file,
-        owner  => 'root',
-        group  => 'root',
-        mode   => '0555',
-        source => 'puppet:///modules/toollabs/jobkill',
-    }
-
 }
-
diff --git a/modules/role/manifests/toollabs/node/web.pp 
b/modules/role/manifests/toollabs/node/web.pp
index 8968b29..d118d87 100644
--- a/modules/role/manifests/toollabs/node/web.pp
+++ b/modules/role/manifests/toollabs/node/web.pp
@@ -54,13 +54,4 @@
         source  => 'puppet:///modules/toollabs/portreleaser',
         require => 
File['/usr/local/lib/python2.7/dist-packages/portgrabber.py'],
     }
-
-    file { '/usr/local/bin/jobkill':
-        ensure => file,
-        owner  => 'root',
-        group  => 'root',
-        mode   => '0555',
-        source => 'puppet:///modules/toollabs/jobkill',
-    }
-
 }
diff --git a/modules/toollabs/manifests/node/all.pp 
b/modules/toollabs/manifests/node/all.pp
index 722892b..762542c 100644
--- a/modules/toollabs/manifests/node/all.pp
+++ b/modules/toollabs/manifests/node/all.pp
@@ -21,4 +21,12 @@
             size => inline_template('<%= @memorysize_mb.to_i * 3 %>MB'),
         }
     }
+
+    file { '/usr/local/bin/jobkill':
+        ensure => file,
+        owner  => 'root',
+        group  => 'root',
+        mode   => '0555',
+        source => 'puppet:///modules/toollabs/jobkill',
+    }
 }

-- 
To view, visit https://gerrit.wikimedia.org/r/335755
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Iac3b5c5c8b5e48930eebd85cdd15b12451003d13
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Tim Landscheidt <t...@tim-landscheidt.de>

_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits