aboutsummaryrefslogtreecommitdiffstats
path: root/modules
diff options
context:
space:
mode:
authorThomas Backlund <tmb@mageia.org>2012-09-30 19:46:32 +0000
committerThomas Backlund <tmb@mageia.org>2012-09-30 19:46:32 +0000
commit442803384b94aa3d05a52db9ffa658d97f8e2769 (patch)
treed04c3c09264ad78e837380ed208a682cdf94bbfd /modules
parentd724ddf090acf3940d3cce5540fb294b8bad165c (diff)
downloadpuppet-442803384b94aa3d05a52db9ffa658d97f8e2769.tar
puppet-442803384b94aa3d05a52db9ffa658d97f8e2769.tar.gz
puppet-442803384b94aa3d05a52db9ffa658d97f8e2769.tar.bz2
puppet-442803384b94aa3d05a52db9ffa658d97f8e2769.tar.xz
puppet-442803384b94aa3d05a52db9ffa658d97f8e2769.zip
update specs for new rabbit and ecosse
Diffstat (limited to 'modules')
-rw-r--r--modules/xymon/templates/bb-hosts2
-rw-r--r--modules/xymon/templates/hobbit-clients.cfg8
2 files changed, 5 insertions, 5 deletions
diff --git a/modules/xymon/templates/bb-hosts b/modules/xymon/templates/bb-hosts
index cc4cf463..4d0370f3 100644
--- a/modules/xymon/templates/bb-hosts
+++ b/modules/xymon/templates/bb-hosts
@@ -39,7 +39,7 @@ group-compress Marseille
212.85.158.149 jonund.<%= domain %> # testip ssh
212.85.158.150 fiona.<%= domain %> # testip ssh
212.85.158.151 sucuk.<%= domain %> # testip ssh
-212.85.158.152 rabbit.<%= domain %> # ssh
+212.85.158.152 rabbit.<%= domain %> # testip ssh
group-compress Gandi
95.142.164.207 krampouezh.<%= domain %> # ssh dns ldap ldapssl smtp
diff --git a/modules/xymon/templates/hobbit-clients.cfg b/modules/xymon/templates/hobbit-clients.cfg
index 87c039a0..72140850 100644
--- a/modules/xymon/templates/hobbit-clients.cfg
+++ b/modules/xymon/templates/hobbit-clients.cfg
@@ -354,13 +354,13 @@ HOST=rabbit.<%= domain %>
HOST=jonund.<%= domain %>
LOAD 36.0 48.0
-# ecosse has 8 cores, is a builder, and we try to use them all
+# ecosse has 24 cores, is a builder, and we try to use them all
HOST=ecosse.<%= domain %>
- LOAD 12.0 16.0
+ LOAD 36.0 48.0
-# rabbit has 8 and mksquashfs uses all of them
+# rabbit has 12 and mksquashfs uses all of them
HOST=rabbit.<%= domain %>
- LOAD 12.0 16.0
+ LOAD 18.0 24.0
DEFAULT
# These are the built-in defaults.