Yuvipanda has uploaded a new change for review.
https://gerrit.wikimedia.org/r/265176
Change subject: toollabs: Do not use inheritance for submit role
......................................................................
toollabs: Do not use inheritance for submit role
Change-Id: I67791519a692e8d78f65e6c2bda461454cb40ff0
---
M manifests/role/labstools.pp
M modules/gridengine/manifests/submit_host.pp
2 files changed, 9 insertions(+), 6 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/76/265176/1
diff --git a/manifests/role/labstools.pp b/manifests/role/labstools.pp
index 3a49b65..c4098ea 100644
--- a/manifests/role/labstools.pp
+++ b/manifests/role/labstools.pp
@@ -51,10 +51,12 @@
}
}
- class submit inherits role::labs::tools::common {
- include toollabs::submit
+ class submit {
+ include ::toollabs::submit
- system::role { 'role::labs::tools::submit': description => 'Tool Labs
job submit (cron) host' }
+ system::role { 'role::labs::tools::submit':
+ description => 'Tool Labs job submit (cron) host',
+ }
}
class proxy {
diff --git a/modules/gridengine/manifests/submit_host.pp
b/modules/gridengine/manifests/submit_host.pp
index 0940161..509208f 100644
--- a/modules/gridengine/manifests/submit_host.pp
+++ b/modules/gridengine/manifests/submit_host.pp
@@ -1,7 +1,9 @@
# gridengine/submit_host.pp
-class gridengine::submit_host
-{
+class gridengine::submit_host {
+
+ include ::gridengine
+
package { [ 'jobutils' ]:
ensure => latest,
}
@@ -23,4 +25,3 @@
}
}
-
--
To view, visit https://gerrit.wikimedia.org/r/265176
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I67791519a692e8d78f65e6c2bda461454cb40ff0
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Yuvipanda <yuvipa...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
