Madhuvishy has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/352281 )
Change subject: gridengine: Cleanup mergeconf script and references
......................................................................
gridengine: Cleanup mergeconf script and references
Bug: T162955
Change-Id: Ie6afb841282b52f02a2151acede24f22d54a0053
---
D modules/gridengine/files/mergeconf
M modules/gridengine/manifests/master.pp
2 files changed, 0 insertions(+), 40 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/81/352281/1
diff --git a/modules/gridengine/files/mergeconf
b/modules/gridengine/files/mergeconf
deleted file mode 100755
index 3824d22..0000000
--- a/modules/gridengine/files/mergeconf
+++ /dev/null
@@ -1,32 +0,0 @@
-#! /bin/bash
-#
-# mergconf outfile [infile...]
-#
-# This does a line-by-line merge of the configuration files
-# specified by infile into outfile, keeping only the first
-# of each line that start with the same whitespace-separated
-# keyword, into the outfile iff it differs from any existing
-# outfile.
-#
-# It will try to glob the infile arguments as guard against
-# puppet overquoting globs if they are not readable files.
-#
-# returns true if there is a new outfile in place
-
-conf="$1" && shift
-
-shopt -s nullglob
-
-if [ $# -gt 0 ]; then
- (for f in "$@"; do
- if [ -r "$f" ]; then /bin/cat "$f"; else /bin/cat $f 2>/dev/null; fi
- done) | /usr/bin/sort -ufst ' ' -k 1,1 >"$conf~"
- if [ -r "$conf~" ]; then
- if ! diff -qbBZN "$conf~" "$conf" >/dev/null; then
- mv "$conf~" "$conf" && exit 0
- fi
- rm -f "$conf~"
- fi
-fi
-exit 1
-
diff --git a/modules/gridengine/manifests/master.pp
b/modules/gridengine/manifests/master.pp
index aa1e524..79fa290 100644
--- a/modules/gridengine/manifests/master.pp
+++ b/modules/gridengine/manifests/master.pp
@@ -33,14 +33,6 @@
purge => true,
}
- file { "${etcdir}/bin/mergeconf":
- ensure => absent,
- owner => 'root',
- group => 'root',
- mode => '0555',
- source => 'puppet:///modules/gridengine/mergeconf',
- }
-
file { "${etcdir}/bin/tracker":
ensure => file,
owner => 'root',
--
To view, visit https://gerrit.wikimedia.org/r/352281
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie6afb841282b52f02a2151acede24f22d54a0053
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Madhuvishy <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
