[MediaWiki-commits] [Gerrit] Labs: more tweaks to gridengine puppetization - change (operations/puppet)

[coren (Code Review)]

coren has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/167211

Change subject: Labs: more tweaks to gridengine puppetization
......................................................................

Labs: more tweaks to gridengine puppetization

Change-Id: I919a9289653e60df6714a20fe7bbce9003341df6
---
M modules/gridengine/files/runpurge
M modules/toollabs/manifests/hostgroup.pp
M modules/toollabs/manifests/master.pp
3 files changed, 3 insertions(+), 3 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/11/167211/1

diff --git a/modules/gridengine/files/runpurge 
b/modules/gridengine/files/runpurge
index 4f375c7..be0db9a 100755
--- a/modules/gridengine/files/runpurge
+++ b/modules/gridengine/files/runpurge
@@ -13,7 +13,7 @@
 cd "$1" || exit 1
 
 for f in *; do
-  if [ ! -f "$2/$f" ]; then
+  if [ -f "$f" -a ! -f "$2/$f" ]; then
     /bin/bash "$f" && /bin/rm "$f"
   fi
 done
diff --git a/modules/toollabs/manifests/hostgroup.pp 
b/modules/toollabs/manifests/hostgroup.pp
index 61fef9a..9b6498c 100644
--- a/modules/toollabs/manifests/hostgroup.pp
+++ b/modules/toollabs/manifests/hostgroup.pp
@@ -25,7 +25,7 @@
             owner   => 'root',
             group   => 'root',
             mode    => '0444',
-            content => inline_template('<% @groups.each do |g| -%><%= g %><% 
end -%>'),
+            content => inline_template("<% @groups.each do |g| -%><%= g %>\n<% 
end -%>"),
         }
     }
 
diff --git a/modules/toollabs/manifests/master.pp 
b/modules/toollabs/manifests/master.pp
index 51e827a..75d7fac 100644
--- a/modules/toollabs/manifests/master.pp
+++ b/modules/toollabs/manifests/master.pp
@@ -25,7 +25,7 @@
         owner        => 'root',
         group        => 'root',
         mode         => '0755',
-        source       => 'puppet:///modules/gridengine/gethgrp',
+        source       => 'puppet:///modules/toollabs/gethgrp',
     }
 
     toollabs::hostgroup::collector { 'general': }

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I919a9289653e60df6714a20fe7bbce9003341df6
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: coren <mpellet...@wikimedia.org>

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