From 63f0890579b944d1c2b17070a6330aedac121928 Mon Sep 17 00:00:00 2001
From: Clark Boylan <clark.boylan@gmail.com>
Date: Thu, 21 Nov 2013 17:40:55 -0800
Subject: [PATCH] Consolidate rsyslog configs.

Puppet doesn't allow non unique namevars. Having mutliple rsyslog
service definitions violates this rule. Work around this by
consolidating all rsyslog configs in openstack_project::template.
In the process of doing this it became apparent that the ensure whoopsie
was absent resource should be consolidated in to template.pp as well so
this was done as part of the larger consolidation.

Change-Id: I7effed7bacb85386f0cf36edffe442e2cad944d0
---
 modules/jenkins/manifests/slave.pp            | 17 ---------
 modules/openstack_project/manifests/server.pp | 24 ------------
 .../openstack_project/manifests/template.pp   | 38 +++++++++++++++++++
 3 files changed, 38 insertions(+), 41 deletions(-)

diff --git a/modules/jenkins/manifests/slave.pp b/modules/jenkins/manifests/slave.pp
index 495508b176..44f55fd8a5 100644
--- a/modules/jenkins/manifests/slave.pp
+++ b/modules/jenkins/manifests/slave.pp
@@ -337,21 +337,4 @@ class jenkins::slave(
       }
     }
   }
-
-  # Increase syslog message size in order to capture
-  # python tracebacks with syslog.
-  file { '/etc/rsyslog.d/99-maxsize.conf':
-    ensure  => present,
-    # Note MaxMessageSize is not a puppet variable.
-    content => '$MaxMessageSize 6k',
-    owner   => 'root',
-    group   => 'root',
-    mode    => '0644',
-  }
-
-  service { 'rsyslog':
-    ensure    => running,
-    enable    => true,
-    subscribe => File['/etc/rsyslog.d/99-maxsize.conf'],
-  }
 }
diff --git a/modules/openstack_project/manifests/server.pp b/modules/openstack_project/manifests/server.pp
index 8769b4828b..6b1d71c531 100644
--- a/modules/openstack_project/manifests/server.pp
+++ b/modules/openstack_project/manifests/server.pp
@@ -19,28 +19,4 @@ class openstack_project::server (
   class { 'exim':
     sysadmin => $sysadmins,
   }
-
-  if $::osfamily == 'Debian' {
-    # Custom rsyslog config to disable /dev/xconsole noise on Debuntu servers
-    file { '/etc/rsyslog.d/50-default.conf':
-      ensure  => present,
-      owner   => 'root',
-      group   => 'root',
-      mode    => '0644',
-      source  =>
-        'puppet:///modules/openstack_project/rsyslog.d_50-default.conf',
-      replace => true,
-    }
-    service { 'rsyslog':
-      ensure      => running,
-      hasrestart  => true,
-      subscribe   => File['/etc/rsyslog.d/50-default.conf'],
-    }
-
-    # Ubuntu installs their whoopsie package by default, but it eats through
-    # memory and we don't need it on servers
-    package { 'whoopsie':
-      ensure => absent,
-    }
-  }
 }
diff --git a/modules/openstack_project/manifests/template.pp b/modules/openstack_project/manifests/template.pp
index 7ef6e2f611..ecd4005f89 100644
--- a/modules/openstack_project/manifests/template.pp
+++ b/modules/openstack_project/manifests/template.pp
@@ -35,4 +35,42 @@ class openstack_project::template (
   package { 'tcpdump':
     ensure => present,
   }
+
+  if $::osfamily == 'Debian' {
+    # Custom rsyslog config to disable /dev/xconsole noise on Debuntu servers
+    file { '/etc/rsyslog.d/50-default.conf':
+      ensure  => present,
+      owner   => 'root',
+      group   => 'root',
+      mode    => '0644',
+      source  =>
+        'puppet:///modules/openstack_project/rsyslog.d_50-default.conf',
+      replace => true,
+      notify  => Service['rsyslog'],
+    }
+
+    # Ubuntu installs their whoopsie package by default, but it eats through
+    # memory and we don't need it on servers
+    package { 'whoopsie':
+      ensure => absent,
+    }
+  }
+
+  # Increase syslog message size in order to capture
+  # python tracebacks with syslog.
+  file { '/etc/rsyslog.d/99-maxsize.conf':
+    ensure  => present,
+    # Note MaxMessageSize is not a puppet variable.
+    content => '$MaxMessageSize 6k',
+    owner   => 'root',
+    group   => 'root',
+    mode    => '0644',
+    notify  => Service['rsyslog'],
+  }
+
+  service { 'rsyslog':
+    ensure     => running,
+    enable     => true,
+    hasrestart => true,
+  }
 }