Yuvipanda has submitted this change and it was merged.
Change subject: toollabs: Remove inheritance in role from compute
......................................................................
toollabs: Remove inheritance in role from compute
Move to an include in the class instead
Change-Id: Ic5aa8e17cb984d329b26a50a1d252795fc1540c2
---
M manifests/role/labstools.pp
M modules/toollabs/manifests/compute.pp
2 files changed, 3 insertions(+), 2 deletions(-)
Approvals:
Yuvipanda: Verified; Looks good to me, approved
diff --git a/manifests/role/labstools.pp b/manifests/role/labstools.pp
index 7b6def4..4fd226d 100644
--- a/manifests/role/labstools.pp
+++ b/manifests/role/labstools.pp
@@ -11,7 +11,7 @@
system::role { 'role::labs::tools::bastion': description => 'Tool Labs
bastion' }
}
- class compute inherits role::labs::tools::common {
+ class compute {
include toollabs::compute
system::role { 'role::labs::tools::compute': description => 'Tool Labs
compute node' }
diff --git a/modules/toollabs/manifests/compute.pp
b/modules/toollabs/manifests/compute.pp
index 861af30..262f931 100644
--- a/modules/toollabs/manifests/compute.pp
+++ b/modules/toollabs/manifests/compute.pp
@@ -17,7 +17,8 @@
class toollabs::compute inherits toollabs {
include toollabs::exec_environ,
- toollabs::hba
+ toollabs::hba,
+ gridengine
motd::script { 'exechost-banner':
ensure => present,
--
To view, visit https://gerrit.wikimedia.org/r/265204
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ic5aa8e17cb984d329b26a50a1d252795fc1540c2
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Yuvipanda <[email protected]>
Gerrit-Reviewer: Merlijn van Deen <[email protected]>
Gerrit-Reviewer: Yuvipanda <[email protected]>
Gerrit-Reviewer: coren <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
