coren has uploaded a new change for review.
https://gerrit.wikimedia.org/r/168173
Change subject: Gridengine: remove redundant inclusion of parent
......................................................................
Gridengine: remove redundant inclusion of parent
class gridengine needs to be included globally now, not from
within the specific roles. Removed from gridengine::master
and gridengine::shadow_master.
Change-Id: I060ac8346452497d6d43f6b2750f1e7b527b709c
---
M modules/gridengine/manifests/master.pp
M modules/gridengine/manifests/shadow_master.pp
2 files changed, 0 insertions(+), 7 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/73/168173/1
diff --git a/modules/gridengine/manifests/master.pp
b/modules/gridengine/manifests/master.pp
index 9a6f722..8bdcc98 100644
--- a/modules/gridengine/manifests/master.pp
+++ b/modules/gridengine/manifests/master.pp
@@ -2,10 +2,6 @@
class gridengine::master
{
- class { 'gridengine':
- gridmaster => $fqdn,
- }
-
package { 'gridengine-master':
ensure => latest,
require => Package['gridengine-common'],
diff --git a/modules/gridengine/manifests/shadow_master.pp
b/modules/gridengine/manifests/shadow_master.pp
index 5aeb184..a0c7047 100644
--- a/modules/gridengine/manifests/shadow_master.pp
+++ b/modules/gridengine/manifests/shadow_master.pp
@@ -4,9 +4,6 @@
$gridmaster = $grid_master,
$sgeroot = '/var/lib/gridengine',
) {
- class { 'gridengine':
- gridmaster => $gridmaster,
- }
package { 'gridengine-master':
ensure => latest,
--
To view, visit https://gerrit.wikimedia.org/r/168173
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I060ac8346452497d6d43f6b2750f1e7b527b709c
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: coren <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
