Rush has uploaded a new change for review. https://gerrit.wikimedia.org/r/322149
Change subject: gridengine: refactor and establish norms ...................................................................... gridengine: refactor and establish norms * consistent () and {} for class params * params end w/ a ',' * require as last stanza item * Ditch static class headers * consistent spacing in stanza params Change-Id: I4f2ec6f544c5a07471743c6880b0a49f34728eda --- M modules/gridengine/manifests/admin_host.pp M modules/gridengine/manifests/collector.pp M modules/gridengine/manifests/exec_host.pp M modules/gridengine/manifests/hostgroup.pp M modules/gridengine/manifests/init.pp M modules/gridengine/manifests/join.pp M modules/gridengine/manifests/queue.pp M modules/gridengine/manifests/resource.pp M modules/gridengine/manifests/resourcedir.pp M modules/gridengine/manifests/shadow_master.pp M modules/gridengine/manifests/submit_host.pp 11 files changed, 25 insertions(+), 34 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/49/322149/1 diff --git a/modules/gridengine/manifests/admin_host.pp b/modules/gridengine/manifests/admin_host.pp index b8306c0..9c188af 100644 --- a/modules/gridengine/manifests/admin_host.pp +++ b/modules/gridengine/manifests/admin_host.pp @@ -2,13 +2,10 @@ class gridengine::admin_host( $config = undef, -) -{ +) { gridengine::resource { "admin-${::fqdn}": rname => $::fqdn, dir => 'adminhosts', config => $config, } - } - diff --git a/modules/gridengine/manifests/collector.pp b/modules/gridengine/manifests/collector.pp index 14cad3f..bf58193 100644 --- a/modules/gridengine/manifests/collector.pp +++ b/modules/gridengine/manifests/collector.pp @@ -4,8 +4,9 @@ $dir, $sourcedir, $rname = $title, - $config = undef ) -{ + $config = undef, +) { + $etcdir = '/var/lib/gridengine/etc' $conf = "${etcdir}/${dir}/${rname}" $dotfile = "${etcdir}/${dir}/.${rname}" @@ -23,6 +24,4 @@ command => "${etcdir}/bin/collector '${rname}' '${sourcedir}' '${dotfile}' '${conf}'", require => File[$dotfile], } - } - diff --git a/modules/gridengine/manifests/exec_host.pp b/modules/gridengine/manifests/exec_host.pp index d575d3e..05019e5 100644 --- a/modules/gridengine/manifests/exec_host.pp +++ b/modules/gridengine/manifests/exec_host.pp @@ -2,8 +2,8 @@ class gridengine::exec_host( $config = undef, -) -{ +) { + include gridengine package { 'gridengine-exec': @@ -24,5 +24,4 @@ dir => 'exechosts', config => $config, } - } diff --git a/modules/gridengine/manifests/hostgroup.pp b/modules/gridengine/manifests/hostgroup.pp index 5ac1485..87a2b51 100644 --- a/modules/gridengine/manifests/hostgroup.pp +++ b/modules/gridengine/manifests/hostgroup.pp @@ -2,13 +2,12 @@ define gridengine::hostgroup( $rname = $title, - $config = undef ) -{ + $config = undef, +) { gridengine::resource { $rname: dir => 'hostgroups', config => $config, } - } diff --git a/modules/gridengine/manifests/init.pp b/modules/gridengine/manifests/init.pp index 59bac74..38140c2 100644 --- a/modules/gridengine/manifests/init.pp +++ b/modules/gridengine/manifests/init.pp @@ -1,5 +1,3 @@ -# gridengine/init.pp -# # The gridmaster parameter is used in the template to preseed the package # installation with the (annoyingly) semi-hardcoded FQDN to the grid # master server. @@ -17,6 +15,7 @@ # definition. If you change it here, you must change it everywhere. class gridengine($gridmaster) { + file { '/var/local/preseed': ensure => directory, mode => '0600', @@ -24,16 +23,16 @@ file { '/var/local/preseed/gridengine.preseed': ensure => 'file', - require => File['/var/local/preseed'], mode => '0600', backup => false, content => template('gridengine/gridengine.preseed.erb'), + require => File['/var/local/preseed'], } package { 'gridengine-common': ensure => latest, - require => File['/var/local/preseed/gridengine.preseed'], responsefile => '/var/local/preseed/gridengine.preseed', + require => File['/var/local/preseed/gridengine.preseed'], } $etcdir = '/var/lib/gridengine/etc' diff --git a/modules/gridengine/manifests/join.pp b/modules/gridengine/manifests/join.pp index b82d5dd..7e208c3 100644 --- a/modules/gridengine/manifests/join.pp +++ b/modules/gridengine/manifests/join.pp @@ -2,8 +2,9 @@ define gridengine::join( $sourcedir, - $list = undef ) -{ + $list = undef, +) { + if $list { file { "${sourcedir}/${::fqdn}": ensure => file, @@ -18,4 +19,3 @@ } } } - diff --git a/modules/gridengine/manifests/queue.pp b/modules/gridengine/manifests/queue.pp index 8069e32..1cef26c 100644 --- a/modules/gridengine/manifests/queue.pp +++ b/modules/gridengine/manifests/queue.pp @@ -2,13 +2,12 @@ define gridengine::queue( $rname = $title, - $config = undef ) -{ + $config = undef, +) { gridengine::resource { $rname: dir => 'queues', config => $config, } - } diff --git a/modules/gridengine/manifests/resource.pp b/modules/gridengine/manifests/resource.pp index 8910399..06de046 100644 --- a/modules/gridengine/manifests/resource.pp +++ b/modules/gridengine/manifests/resource.pp @@ -3,8 +3,9 @@ define gridengine::resource( $dir, $rname = $title, - $config = undef ) -{ + $config = undef, +) { + $etcdir = '/var/lib/gridengine/etc' $conf = "${etcdir}/${dir}/${rname}" diff --git a/modules/gridengine/manifests/resourcedir.pp b/modules/gridengine/manifests/resourcedir.pp index eec725c..59f5e80 100644 --- a/modules/gridengine/manifests/resourcedir.pp +++ b/modules/gridengine/manifests/resourcedir.pp @@ -5,7 +5,8 @@ $modcmd, $delcmd, $dir = $title, -){ +) { + $etcdir = '/var/lib/gridengine/etc' $confdir = "${etcdir}/${dir}" $trackerdir = "${etcdir}/tracker/${dir}" @@ -32,8 +33,6 @@ exec { "track-${dir}": command => "${etcdir}/bin/tracker '${confdir}' '${trackerdir}' '${addcmd}' '${modcmd}' '${delcmd}'", - require => File[ "${etcdir}/bin/tracker", $confdir, $trackerdir ], + require => File["${etcdir}/bin/tracker", $confdir, $trackerdir], } - } - diff --git a/modules/gridengine/manifests/shadow_master.pp b/modules/gridengine/manifests/shadow_master.pp index bdd63fb..52abb18 100644 --- a/modules/gridengine/manifests/shadow_master.pp +++ b/modules/gridengine/manifests/shadow_master.pp @@ -3,7 +3,7 @@ class gridengine::shadow_master( $gridmaster = $grid_master, $sgeroot = '/var/lib/gridengine', - ) { +) { include ::gridengine package { 'gridengine-master': @@ -13,18 +13,18 @@ file { "${sgeroot}/default": ensure => directory, - require => [ File[$sgeroot], Package['gridengine-common'] ], owner => 'sgeadmin', group => 'sgeadmin', mode => '2775', + require => [ File[$sgeroot], Package['gridengine-common'] ], } file { "${sgeroot}/default/common": ensure => directory, - require => File["${sgeroot}/default"], owner => 'sgeadmin', group => 'sgeadmin', mode => '2775', + require => File["${sgeroot}/default"], } file { '/etc/default/gridengine': diff --git a/modules/gridengine/manifests/submit_host.pp b/modules/gridengine/manifests/submit_host.pp index 27d4f40..c32704f 100644 --- a/modules/gridengine/manifests/submit_host.pp +++ b/modules/gridengine/manifests/submit_host.pp @@ -23,5 +23,4 @@ dir => 'submithosts', config => 'gridengine/nothing.erb', # the content here doesn't actually matter } - } -- To view, visit https://gerrit.wikimedia.org/r/322149 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I4f2ec6f544c5a07471743c6880b0a49f34728eda Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Rush <r...@wikimedia.org> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits