From 9f0d0dfc83c23c0e0059000baec8302ae7829b9c Mon Sep 17 00:00:00 2001
From: Jeremy Stanley <fungi@yuggoth.org>
Date: Thu, 27 Feb 2014 00:12:33 +0000
Subject: [PATCH] Fix rsyslog duplicate declaration for git.o.o

It's already declared in the template class, which is included by
the git class.

Change-Id: I94b660f13f93a459a9c130804f0d9b3409055138
---
 modules/openstack_project/manifests/git.pp | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/modules/openstack_project/manifests/git.pp b/modules/openstack_project/manifests/git.pp
index 27b4c65caa..9356df3710 100644
--- a/modules/openstack_project/manifests/git.pp
+++ b/modules/openstack_project/manifests/git.pp
@@ -111,9 +111,6 @@ class openstack_project::git (
     group  => 'root',
     mode   => '0644',
     source => 'puppet:///modules/openstack_project/git/rsyslog.haproxy.conf',
-  }
-  service { 'rsyslog':
-    ensure    => running,
-    subscribe => file['/etc/rsyslog.d/haproxy.conf'],
+    notify => Service['rsyslog'],
   }
 }