]> gitweb.fluxo.info Git - puppet-nodo.git/commitdiff
Fix at puppetmaster ports on nodo::vserver::instance
authorSilvio Rhatto <rhatto@riseup.net>
Thu, 3 Jun 2010 20:02:34 +0000 (17:02 -0300)
committerSilvio Rhatto <rhatto@riseup.net>
Thu, 3 Jun 2010 20:02:34 +0000 (17:02 -0300)
manifests/vserver.pp

index 17be6c3abd6e14fbaea438e3cd5e0cff77df326b..d27b4f4556c813324ee3e3828126641702ffee15 100644 (file)
@@ -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",