From: Silvio Rhatto <rhatto@riseup.net>
Date: Thu, 3 Jun 2010 20:02:34 +0000 (-0300)
Subject: Fix at puppetmaster ports on nodo::vserver::instance
X-Git-Url: https://gitweb.fluxo.info/?a=commitdiff_plain;h=e40534a0dbd2d79a888ac97935dfba7161d8fbc4;p=puppet-nodo.git

Fix at puppetmaster ports on nodo::vserver::instance
---

diff --git a/manifests/vserver.pp b/manifests/vserver.pp
index 17be6c3..d27b4f4 100644
--- a/manifests/vserver.pp
+++ b/manifests/vserver.pp
@@ -3,14 +3,6 @@ class nodo::vserver inherits nodo {
   include timezone
   include syslog-ng::vserver
 
-  case $puppetmaster_port {
-    '': { $puppetmaster_port = "8140" }
-  }
-
-  case $puppetmaster_nonssl_port {
-    '': { $puppetmaster_nonssl_port = "8141" }
-  }
-
   backupninja::sys { "sys":
     ensure     => present,
     partitions => false,
@@ -50,6 +42,16 @@ class nodo::vserver inherits nodo {
       $id = $context
     }
 
+    # set puppetmaster ssl port
+    case $puppetmaster_port {
+      '': { $puppetmaster_port = "8140" }
+    }
+
+    # set puppetmaster non-ssl port
+    case $puppetmaster_nonssl_port {
+      '': { $puppetmaster_nonssl_port = "8141" }
+    }
+
     vserver { $name:
       ensure       => $ensure,
       context      => "$context",