From ec823463694885dd24f8ed88c98fded000758a6b Mon Sep 17 00:00:00 2001
From: Monty Taylor <mordred@inaugust.com>
Date: Sat, 5 Jul 2014 16:38:39 -0700
Subject: [PATCH] Pull rsyslog back out from the debian trap

When we put a conditional around rsyslog, it got pulled into
the if debian block - but git.o.o runs on redhat.

Change-Id: I0abea4075d216bf40b2e20e8afe186273e99b7ad
---
 .../openstack_project/manifests/template.pp   | 28 +++++++++----------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/modules/openstack_project/manifests/template.pp b/modules/openstack_project/manifests/template.pp
index 3e23296479..d13e07eb51 100644
--- a/modules/openstack_project/manifests/template.pp
+++ b/modules/openstack_project/manifests/template.pp
@@ -58,20 +58,6 @@ class openstack_project::template (
       ensure => present,
     }
 
-    if ($::in_chroot) {
-      notify { 'rsyslog in chroot':
-        message => 'rsyslog not refreshed, running in chroot',
-      }
-      $rsyslog_notify = []
-    } else {
-      service { 'rsyslog':
-        ensure     => running,
-        enable     => true,
-        hasrestart => true,
-      }
-      $rsyslog_notify = [ Service['rsyslog'] ]
-    }
-
     # Custom rsyslog config to disable /dev/xconsole noise on Debuntu servers
     file { '/etc/rsyslog.d/50-default.conf':
       ensure  => present,
@@ -91,6 +77,20 @@ class openstack_project::template (
     }
   }
 
+  if ($::in_chroot) {
+    notify { 'rsyslog in chroot':
+      message => 'rsyslog not refreshed, running in chroot',
+    }
+    $rsyslog_notify = []
+  } else {
+    service { 'rsyslog':
+      ensure     => running,
+      enable     => true,
+      hasrestart => true,
+    }
+    $rsyslog_notify = [ Service['rsyslog'] ]
+  }
+
   # Increase syslog message size in order to capture
   # python tracebacks with syslog.
   file { '/etc/rsyslog.d/99-maxsize.conf':