aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSilvio Rhatto <rhatto@riseup.net>2011-08-26 15:08:32 -0300
committerSilvio Rhatto <rhatto@riseup.net>2011-08-26 15:08:32 -0300
commit7bd9e7d7a34b9804f0cd1f22ecdd2d3212935bfb (patch)
treeace655a85dca3b8e3d35e84446b3fa314c88dd76
parent411251e994645a9649117ed123013a21865f74cb (diff)
downloadpuppet-nodo-7bd9e7d7a34b9804f0cd1f22ecdd2d3212935bfb.tar.gz
puppet-nodo-7bd9e7d7a34b9804f0cd1f22ecdd2d3212935bfb.tar.bz2
Adding $munin_port and $monkeysphere_ssh_port
-rw-r--r--manifests/physical.pp7
-rw-r--r--manifests/vserver.pp13
2 files changed, 16 insertions, 4 deletions
diff --git a/manifests/physical.pp b/manifests/physical.pp
index 95f863d..657c7d2 100644
--- a/manifests/physical.pp
+++ b/manifests/physical.pp
@@ -49,7 +49,12 @@ class nodo::physical inherits nodo {
}
# Monkeysphere configuration
- monkeysphere_host { "$hostname": }
+ monkeysphere_host { "$hostname":
+ port => $monkeysphere_ssh_port ? {
+ false => '',
+ default => $monkeysphere_ssh_port,
+ }
+ }
# SMART monitoring
include munin::plugins::smart
diff --git a/manifests/vserver.pp b/manifests/vserver.pp
index 2d2ab55..55ed957 100644
--- a/manifests/vserver.pp
+++ b/manifests/vserver.pp
@@ -37,7 +37,8 @@ class nodo::vserver inherits nodo {
define instance($context, $ensure = 'running', $proxy = false,
$puppetmaster = false, $gitd = false, $mail = false,
$icecast = false, $sound = false, $ticket = false,
- $memory_limit = false, $distro = 'squeeze', $dns = false) {
+ $memory_limit = false, $distro = 'squeeze', $dns = false,
+ $munin_port = false, $monkeysphere_ssh_port = false) {
# set instance id
if $context <= 9 {
@@ -81,12 +82,18 @@ class nodo::vserver inherits nodo {
# Create a munin virtual resource to be realized in the node
@@munin_node { "$name":
- port => "49$id",
+ port => $munin_port ? {
+ false => "49$id",
+ default => $munin_port,
+ }
}
# Create a monkeysphere virtual resource to be realized in the node
@@monkeysphere_host { "$name":
- port => "22$id",
+ port => $monkeysphere_ssh_port ? {
+ false => "22$id",
+ default => $monkeysphere_ssh_port,
+ }
}
# Sound support