coren has submitted this change and it was merged.
Change subject: toollabs: make sure /tmp and swap are large for all exec hosts
......................................................................
toollabs: make sure /tmp and swap are large for all exec hosts
Note that this also subtly changes regular exec hosts, which did not
include the base toollabs class before.
Bug: T118419
Change-Id: I199bc73eab029829100cad838557e2018e449eb9
---
M modules/toollabs/manifests/node/compute/dedicated.pp
M modules/toollabs/manifests/node/compute/general.pp
A modules/toollabs/manifests/node/init.pp
M modules/toollabs/manifests/node/web.pp
4 files changed, 37 insertions(+), 13 deletions(-)
Approvals:
Merlijn van Deen: 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/compute/dedicated.pp
b/modules/toollabs/manifests/node/compute/dedicated.pp
index 9476b3e..a201f75 100644
--- a/modules/toollabs/manifests/node/compute/dedicated.pp
+++ b/modules/toollabs/manifests/node/compute/dedicated.pp
@@ -12,6 +12,8 @@
#
class toollabs::node::compute::dedicated {
+ include toollabs::node
+
if $::node_dedicated_tool {
system::role { 'toollabs::node::compute::dedicated':
@@ -48,4 +50,5 @@
mode => '0555',
source => 'puppet:///modules/toollabs/jobkill',
}
+
}
diff --git a/modules/toollabs/manifests/node/compute/general.pp
b/modules/toollabs/manifests/node/compute/general.pp
index 922ae76..8d83fa7 100644
--- a/modules/toollabs/manifests/node/compute/general.pp
+++ b/modules/toollabs/manifests/node/compute/general.pp
@@ -12,6 +12,8 @@
#
class toollabs::node::compute::general {
+ include toollabs::node
+
system::role { 'toollabs::node::compute::general': description => 'General
computation node' }
class { 'gridengine::exec_host':
@@ -28,16 +30,5 @@
source => 'puppet:///modules/toollabs/jobkill',
}
- # 16G /tmp for everyone! Note that we need new nodes to be at least a
large (80G total space)
- labs_lvm::volume { 'separate-tmp':
- size => '16GB',
- mountat => '/tmp',
- mountmode => '1777',
- options => 'nosuid,noexec,nodev,rw',
- }
-
- labs_lvm::swap { 'big':
- size => inline_template('<%= @memorysize_mb.to_i * 3 %>MB'),
- }
-
}
+
diff --git a/modules/toollabs/manifests/node/init.pp
b/modules/toollabs/manifests/node/init.pp
new file mode 100644
index 0000000..6e15040
--- /dev/null
+++ b/modules/toollabs/manifests/node/init.pp
@@ -0,0 +1,28 @@
+# Class: toollabs::node
+#
+# Base class for compute nodes
+#
+# Parameters:
+#
+# Actions:
+#
+# Requires:
+#
+# Sample Usage:
+#
+class toollabs::node {
+
+ include toollabs
+
+ labs_lvm::volume { 'separate-tmp':
+ size => '16GB',
+ mountat => '/tmp',
+ mountmode => '1777',
+ options => 'nosuid,noexec,nodev,rw',
+ }
+
+ labs_lvm::swap { 'big':
+ size => inline_template('<%= @memorysize_mb.to_i * 3 %>MB'),
+ }
+
+}
diff --git a/modules/toollabs/manifests/node/web.pp
b/modules/toollabs/manifests/node/web.pp
index 2b2d354..45fd157 100644
--- a/modules/toollabs/manifests/node/web.pp
+++ b/modules/toollabs/manifests/node/web.pp
@@ -12,8 +12,9 @@
#
# Sample Usage:
#
-class toollabs::node::web inherits toollabs {
+class toollabs::node::web {
+ include toollabs::node
include gridengine::submit_host
# New style webservices!
@@ -59,4 +60,5 @@
mode => '0555',
source => 'puppet:///modules/toollabs/jobkill',
}
+
}
--
To view, visit https://gerrit.wikimedia.org/r/252506
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I199bc73eab029829100cad838557e2018e449eb9
Gerrit-PatchSet: 4
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Merlijn van Deen <[email protected]>
Gerrit-Reviewer: Merlijn van Deen <[email protected]>
Gerrit-Reviewer: Tim Landscheidt <[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
