coren has submitted this change and it was merged.
Change subject: Tools: can't actually use ../init.pp in a subdirectory
......................................................................
Tools: can't actually use ../init.pp in a subdirectory
Rename node/init.pp to node/all.pp and adjust includes accordingly
Change-Id: Ifa32978f48daf64ccad934fadbc64cd6fad18511
---
R modules/toollabs/manifests/node/all.pp
M modules/toollabs/manifests/node/compute/dedicated.pp
M modules/toollabs/manifests/node/compute/general.pp
M modules/toollabs/manifests/node/web.pp
4 files changed, 6 insertions(+), 6 deletions(-)
Approvals:
Andrew Bogott: Looks good to me, but someone else must approve
coren: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/toollabs/manifests/node/init.pp
b/modules/toollabs/manifests/node/all.pp
similarity index 80%
rename from modules/toollabs/manifests/node/init.pp
rename to modules/toollabs/manifests/node/all.pp
index 6e15040..e248350 100644
--- a/modules/toollabs/manifests/node/init.pp
+++ b/modules/toollabs/manifests/node/all.pp
@@ -1,6 +1,6 @@
-# Class: toollabs::node
+# Class: toollabs::node::all
#
-# Base class for compute nodes
+# Base class for all compute nodes
#
# Parameters:
#
@@ -10,7 +10,7 @@
#
# Sample Usage:
#
-class toollabs::node {
+class toollabs::node::all {
include toollabs
diff --git a/modules/toollabs/manifests/node/compute/dedicated.pp
b/modules/toollabs/manifests/node/compute/dedicated.pp
index a201f75..25e0f6d 100644
--- a/modules/toollabs/manifests/node/compute/dedicated.pp
+++ b/modules/toollabs/manifests/node/compute/dedicated.pp
@@ -12,7 +12,7 @@
#
class toollabs::node::compute::dedicated {
- include toollabs::node
+ include toollabs::node::all
if $::node_dedicated_tool {
diff --git a/modules/toollabs/manifests/node/compute/general.pp
b/modules/toollabs/manifests/node/compute/general.pp
index 8d83fa7..0a8515e 100644
--- a/modules/toollabs/manifests/node/compute/general.pp
+++ b/modules/toollabs/manifests/node/compute/general.pp
@@ -12,7 +12,7 @@
#
class toollabs::node::compute::general {
- include toollabs::node
+ include toollabs::node::all
system::role { 'toollabs::node::compute::general': description => 'General
computation node' }
diff --git a/modules/toollabs/manifests/node/web.pp
b/modules/toollabs/manifests/node/web.pp
index 45fd157..c63e910 100644
--- a/modules/toollabs/manifests/node/web.pp
+++ b/modules/toollabs/manifests/node/web.pp
@@ -14,7 +14,7 @@
#
class toollabs::node::web {
- include toollabs::node
+ include toollabs::node::all
include gridengine::submit_host
# New style webservices!
--
To view, visit https://gerrit.wikimedia.org/r/254447
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ifa32978f48daf64ccad934fadbc64cd6fad18511
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: coren <[email protected]>
Gerrit-Reviewer: Andrew Bogott <[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
