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

2014-10-17 Thread coren (Code Review) 
coren has uploaded a new change for review.

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

Change subject: Labs: more tweaks to the gridengine class
..

Labs: more tweaks to the gridengine class

sourceselect = all keeps getting confused.  Be more verbose, but
more explicit.

Change-Id: I181357b3fd446038c40330f26c44a2995783d0d7
---
M modules/gridengine/manifests/master.pp
M modules/toollabs/manifests/hostgroup.pp
2 files changed, 33 insertions(+), 13 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/09/167209/1

diff --git a/modules/gridengine/manifests/master.pp 
b/modules/gridengine/manifests/master.pp
index db84341..c464f30 100644
--- a/modules/gridengine/manifests/master.pp
+++ b/modules/gridengine/manifests/master.pp
@@ -34,18 +34,38 @@
 purge   = true,
 }
 
-file { $etcdir/bin/:
-ensure   = directory,
-force= true,
-owner= 'root',
-group= 'root',
-mode = '0755',
-recurse  = true,
-purge= true,
-sourceselect = all,
-source   = [ 'puppet:///modules/gridengine/mergeconf',
-  'puppet:///modules/gridengine/trackpurge',
-  'puppet:///modules/gridengine/runpurge' ],
+file { $etcdir/bin:
+ensure  = directory,
+force   = true,
+owner   = 'root',
+group   = 'root',
+mode= '0755',
+recurse = true,
+purge   = true,
+}
+
+file { $etcdir/bin/mergeconf:
+ensure  = file,
+owner   = 'root',
+group   = 'root',
+mode= '0555',
+source  = 'puppet:///modules/gridengine/mergeconf',
+}
+
+file { $etcdir/bin/trackpurge:
+ensure  = file,
+owner   = 'root',
+group   = 'root',
+mode= '0555',
+source  = 'puppet:///modules/gridengine/trackpurge',
+}
+
+file { $etcdir/bin/runpurge:
+ensure  = file,
+owner   = 'root',
+group   = 'root',
+mode= '0555',
+source  = 'puppet:///modules/gridengine/runpurge',
 }
 
 gridengine::resourcedir { 'queues': }
diff --git a/modules/toollabs/manifests/hostgroup.pp 
b/modules/toollabs/manifests/hostgroup.pp
index c7bdc27..61fef9a 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 {|g| print #{g}\n } 
-%'),
+content = inline_template('% @groups.each do |g| -%%= g %% 
end -%'),
 }
 }
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I181357b3fd446038c40330f26c44a2995783d0d7
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

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

2014-10-17 Thread coren (Code Review) 
coren has submitted this change and it was merged.

Change subject: Labs: more tweaks to the gridengine class
..


Labs: more tweaks to the gridengine class

sourceselect = all keeps getting confused.  Be more verbose, but
more explicit.

Change-Id: I181357b3fd446038c40330f26c44a2995783d0d7
---
M modules/gridengine/manifests/master.pp
M modules/toollabs/manifests/hostgroup.pp
2 files changed, 33 insertions(+), 13 deletions(-)

Approvals:
  coren: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/modules/gridengine/manifests/master.pp 
b/modules/gridengine/manifests/master.pp
index db84341..c464f30 100644
--- a/modules/gridengine/manifests/master.pp
+++ b/modules/gridengine/manifests/master.pp
@@ -34,18 +34,38 @@
 purge   = true,
 }
 
-file { $etcdir/bin/:
-ensure   = directory,
-force= true,
-owner= 'root',
-group= 'root',
-mode = '0755',
-recurse  = true,
-purge= true,
-sourceselect = all,
-source   = [ 'puppet:///modules/gridengine/mergeconf',
-  'puppet:///modules/gridengine/trackpurge',
-  'puppet:///modules/gridengine/runpurge' ],
+file { $etcdir/bin:
+ensure  = directory,
+force   = true,
+owner   = 'root',
+group   = 'root',
+mode= '0755',
+recurse = true,
+purge   = true,
+}
+
+file { $etcdir/bin/mergeconf:
+ensure  = file,
+owner   = 'root',
+group   = 'root',
+mode= '0555',
+source  = 'puppet:///modules/gridengine/mergeconf',
+}
+
+file { $etcdir/bin/trackpurge:
+ensure  = file,
+owner   = 'root',
+group   = 'root',
+mode= '0555',
+source  = 'puppet:///modules/gridengine/trackpurge',
+}
+
+file { $etcdir/bin/runpurge:
+ensure  = file,
+owner   = 'root',
+group   = 'root',
+mode= '0555',
+source  = 'puppet:///modules/gridengine/runpurge',
 }
 
 gridengine::resourcedir { 'queues': }
diff --git a/modules/toollabs/manifests/hostgroup.pp 
b/modules/toollabs/manifests/hostgroup.pp
index c7bdc27..61fef9a 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 {|g| print #{g}\n } 
-%'),
+content = inline_template('% @groups.each do |g| -%%= g %% 
end -%'),
 }
 }
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I181357b3fd446038c40330f26c44a2995783d0d7
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: coren mpellet...@wikimedia.org
Gerrit-Reviewer: coren mpellet...@wikimedia.org
Gerrit-Reviewer: jenkins-bot 

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