Merge "Consolidate rsyslog configs."

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'],
-  }
 }

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,
-    }
-  }
 }

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,
+  }
 }