Merge pull request #27 from francois/optional-chroot

Made chroot optional
puppetlabs · Aug 16, 2013 · aa3c0f2 · aa3c0f2
2 parents ba514ad + 8c0ea26
commit aa3c0f2
Showing 1 changed file with 16 additions and 6 deletions.
diff --git a/manifests/init.pp b/manifests/init.pp
@@ -112,13 +112,26 @@
       }
     }
 
-    file { $global_options['chroot']:
-      ensure => directory,
+    if $global_options['chroot'] {
+      file { $global_options['chroot']:
+        ensure => directory,
+      }
     }
 
   }
 
   if $manage_service {
+    if $global_options['chroot'] {
+      $deps = [
+        Concat['/etc/haproxy/haproxy.cfg'],
+        File[$global_options['chroot']],
+      ]
+    } else {
+      $deps = [
+        Concat['/etc/haproxy/haproxy.cfg'],
+      ]
+    }
+
     service { 'haproxy':
       ensure     => $enable ? {
         true  => running,
@@ -131,10 +144,7 @@
       name       => 'haproxy',
       hasrestart => true,
       hasstatus  => true,
-      require    => [
-        Concat['/etc/haproxy/haproxy.cfg'],
-        File[$global_options['chroot']],
-      ],
+      require    => $deps,
     }
   }
 }